updating po files. No need of scripts/dev/...

translation.py. Just do `make update-po`

21 files changed, 47282 insertions, 29921 deletions

diff --git a/po/bg.po b/po/bg.po
index 0999e4c72..1f079b951 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,12 +5,12 @@
 #
 # 
 # 
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-04-14 14:12+0300\n"
 "Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -19,15 +19,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber клиент"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Моментни съобщения (Gajim)"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber клиент за бързи съобщения"
 
@@ -44,16 +44,23 @@ msgid "_Discover Services..."
 msgstr "_Откриване на услуги..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "С_тая"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Промяна на акаунт..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Отваряне на пощенската програма"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Състояние"
 
@@ -108,7 +115,7 @@ msgid "Pass_word:"
 msgstr "_Парола:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Запазване на паро_ла"
 
@@ -133,7 +140,7 @@ msgid "Your JID:"
 msgstr "Вашия JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "На_преднали"
 
@@ -147,7 +154,7 @@ msgid "_Host:"
 msgstr "_Хост:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Парола:"
 
@@ -179,10 +186,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Разни</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Лични данни</b>"
 
@@ -199,6 +208,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Автоматично свързване при разпадане на връзката"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "С_вързване при стартиране"
 
@@ -219,6 +229,7 @@ msgstr ""
 "TLS."
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Избор на _ключ..."
 
@@ -235,16 +246,16 @@ msgid "Edit Personal Information..."
 msgstr "Редактиране на личните данни..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Общи"
 
@@ -270,6 +281,7 @@ msgstr ""
 "с цел избягване на разпадането ѝ."
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -278,6 +290,7 @@ msgstr ""
 "само за потребителя"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -286,6 +299,7 @@ msgstr ""
 "използвайки този акаунт."
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -302,18 +316,23 @@ msgstr "Вашите личните данни, както са запазени
 msgid "Manage..."
 msgstr "Управление на..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Няма"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Лични данни"
 
@@ -336,14 +355,18 @@ msgstr ""
 "и същ акаунт. Клиентът с най-голям приоритет ще получава събитията."
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Сървър-посредник:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Ре_сурс: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -357,40 +380,46 @@ msgstr ""
 "ресурси „Вкъщи“ и „На работа“ по едно и също време. Ресурсът с най-голям "
 "приоритет ще получава събитията. (вижте по-долу)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Запазване на _паролата (несигурно)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Запазване на история на _разговорите за всички контакти"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Изпращане на пакети за поддържане на връзката"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Използване на _SSL (извън употреба)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Използване на различен хост/порт"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Използване на сървъри-посредници за файлови трансфери"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Име: "
 
@@ -400,63 +429,92 @@ msgstr "Акаунти"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Ако имате два или повече акаунта и тази опция е избрана, Gajim ще изобразява "
 "всички контакти като от един акаунт."
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Смесване на акаунти"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "Пром_яна"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Премахване"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Акаунт"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Позволение за виждане на състоянието ми"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Добавяне на нов контакт"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Акаунт"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Група:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Псевдоним:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Протокол:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Записване"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "_Регистриране"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "Jabber ID:"
@@ -549,82 +607,63 @@ msgstr "<b>Звуци</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Адрес"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "Напреднали"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Редактор на настройки за напреднали"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Състояние: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Отсъствам"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Зает"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Изтегляне"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Невидим"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "команда"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Добавяне на специално уведомление за %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Не съм на разположение"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Свободен за разговор"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Изпълнение на з_вуци"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -637,74 +676,74 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Скрива бутоните в прозореца на стаята"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Open chat window with user"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Показване само в спис_ъка"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Показване само в спис_ъка"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Порт: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -739,7 +778,7 @@ msgstr "Влизане в _стая"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "Добавяне към _списъка..."
 
@@ -760,7 +799,8 @@ msgid "_Open Link in Browser"
 msgstr "_Отваряне на връзката в браузър"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Започване на разговор"
@@ -770,7 +810,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Натиснете, за да видите стари разговори с този контакт"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Изпращане на _файл"
 
@@ -786,7 +827,8 @@ msgstr "_Компактен изглед (Alt+C)"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_История"
 
@@ -851,7 +893,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "П_родължаване"
 
@@ -888,39 +930,34 @@ msgstr ""
 "Лента"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Активен"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Получер"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Пише"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Стил на шрифта:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Персонализиране на темите на Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Отсъства"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Бездеен"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Курсив"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -928,7 +965,7 @@ msgstr ""
 "Съобщения\n"
 "в стая"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -936,19 +973,19 @@ msgstr ""
 "Съобщения\n"
 "за стая"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Временно преустановен"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "_Цвят на текста"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "_Шрифт на текста"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Фон:"
 
@@ -1069,7 +1106,7 @@ msgid "Accept"
 msgstr "Приемане"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Отказване"
 
@@ -1077,13 +1114,14 @@ msgstr "Отказване"
 msgid "Invitation Received"
 msgstr "Получена покана"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Псевдоним:"
 
@@ -1101,13 +1139,8 @@ msgstr "Скоро посетени:"
 msgid "Room:"
 msgstr "Стая:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Сървър:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Влизане"
 
@@ -1132,6 +1165,10 @@ msgstr "Управление на отметките"
 msgid "Print status:"
 msgstr "Изписване на времето:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Сървър:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Титла:"
@@ -1153,7 +1190,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Настройки на сървъра-посредник"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Име:"
 
@@ -1169,20 +1207,21 @@ msgstr "Използване на удостоверяване"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Натиснете за вмъкване на емотикона (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP криптиране"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Действия"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Изпращане"
 
@@ -1257,18 +1296,25 @@ msgid "Also known as iChat style"
 msgstr "Познато и като стил „iChat“"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Питане за съобщение за състояние при преминаване в режим:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Автоматично „_Отсъствам“ след:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Автоматично „Не съм на _разположение“ след:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1280,19 +1326,19 @@ msgstr ""
 "Винаги да се използват стандартните програми на KDE\n"
 "Персонални"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "П_реди псевдонима:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Разговор"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "У_ведомления при разговор:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1302,35 +1348,40 @@ msgstr ""
 "дразни. Използвайте я внимателно, тъй като блокира всички съобщения от всеки "
 "контакт, който не е в списъка."
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Съобщение за състояние"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "Стандартен _набор икони за състояние:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показване на _аватари на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Показване на _съобщенията за състояние на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "Всеки 5 _минути"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Емотикони:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Събития"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1339,13 +1390,13 @@ msgstr ""
 "Gajim може да изпраща и получава мета-информация, свързана с разговора с "
 "даден контакт. Тук може да укажете кои състояния бихте искали да изпращате."
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Автоматично ще се показват нови събития с изскачане на съотвения прозорец"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1353,7 +1404,7 @@ msgstr ""
 "Ще се появяват съобщения за уведомяване чрез изскачащ прозорец в долния "
 "десен ъгъл на екрана"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1361,7 +1412,7 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "свързване на контакти"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1369,19 +1420,25 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "изключване на контакти"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Само ще се променя иконата на контакта, от който идва новото събитие"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr ""
 "Ако е избрано, Gajim ще изобразява аватари на контакти в списъка и стаите"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1389,7 +1446,7 @@ msgstr ""
 "Ако е избрано, съобщенията за състояние на контактите ще се показват под "
 "имената им в списъка и в стаите"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1397,7 +1454,7 @@ msgstr ""
 "Ако тази опция е избрана, ще се запомнят размерите и позициите на списъка и "
 "прозореца за разговор на екрана за следващото стартиране на програмата."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1407,7 +1464,7 @@ msgstr ""
 "състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
 "състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1415,11 +1472,11 @@ msgstr ""
 "Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
 "съответните анимирани или статични емотикони."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "_Управление..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1431,82 +1488,86 @@ msgstr ""
 "Според акаунта\n"
 "Според типа"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Уведомяване за контакти при: "
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Уведомяване при нова _Gmail поща"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "На _всяко съобщение"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "_Един прозорец за разговори:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Изпълнение на з_вуци"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Изписване на времето:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Запазване на _положението и размера на списъка с контакти и прозорците за "
 "разговор"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Показване само в спис_ъка"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_Свързване"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "Изкл_ючване"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Състояние"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Автоматично съобщение за състояние при „Отсъствам“"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Автоматично съобщение за състояние при „Не съм на разположение“"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Използване на набор и_кони на транспортите"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Икона в областта за уведомяване"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1518,151 +1579,160 @@ msgstr ""
 "събития за нови съобщения възникват само ако са нови съобщения от контакт, с "
 "който не говорите в момента."
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "При получаване на ново събитие"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Редактор на настройки за напреднали"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "_След времето:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "_Преди времето:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "Интернет _браузър:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "_Файлов мениджър:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Шрифт:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Осветяване на неправилно изписаните думи"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "В_ходящо съобщение:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Пощенска програма:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Никога"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Уведомяване"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Отваряне..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "_Изходящо съобщение:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "Пле_йър:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Показване"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "Възстановяване на стандартните _цветове"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "Подре_ждане на контактите по състояние"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "С_ъобщение за състояние:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_Адрес-УРЛ:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "минути"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Лични разговори"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Формат на реда</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "С_вързване при стартиране"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Изтриване"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Сървър:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Списък с изритани"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Записване"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "В групата"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1670,32 +1740,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Изпращане на съобщение"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Запитване за състоянието на контакта"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Позволение за виждане на състоянието ми"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Относно"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Адрес"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Избор на _аватар"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Рожден ден:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Град:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Фирма:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Държава:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Отдел:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Е-поща:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Допълнителен адрес:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Фамилия:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Формат: гггг-мм-дд"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Собствено:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Страница в Интернет:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Бащино:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Още"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Лични данни"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Телефон:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Длъжност:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Пощенски код:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Обръщение:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Роля:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Щат:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Улица:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Наставка:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Работа"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Публикуване"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Извличане"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1715,47 +1925,58 @@ msgid "A_sk to see his/her status"
 msgstr "Запитване за състоянието на контакта"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Добавяне на специално _уведомление"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Задаване на Open_PGP ключ"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Редактиране на _групи"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Изпращане на _еднократно съобщение"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Започване на _разговор"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Позволение за виждане на състоянието ми"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Забрана за виждане на състоянието ми"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Премахване от списъка"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Преименуване"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Записване"
 
@@ -1780,42 +2001,53 @@ msgid "Help online"
 msgstr "Помощ в Интернет (уеб страници)"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Профил и аватар"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Транспорти"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Ръководства"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Откриване на услуги"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_ЧЗВ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Помощ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Изход"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Глас"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Отиване"
@@ -1885,23 +2117,19 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Упълномощаване на контакта, така че да знае кога сте свързани"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "_Данни за контакта"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Отказване на упълномощаване на контакт, така че да не знае кога сте свързани"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Искане за записване"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Упълномощаване"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Отказване"
 
@@ -1917,164 +2145,51 @@ msgstr "Показване на спис_ъка"
 msgid "Sta_tus"
 msgstr "С_ъстояние"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Относно"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Адрес"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Питане за:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Рожден ден:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Град:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Клиент:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Фирма:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Данни за контакта"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Държава:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Отдел:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "Е-поща:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Допълнителен адрес:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Фамилия:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Формат: гггг-мм-дд"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Собствено:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Страница в Интернет:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Контакти"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Местонахождение"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Бащино:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Още"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Телефон:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Длъжност:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Пощенски код:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Обръщение:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Роля:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Избор на _аватар"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Щат:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Състояние:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Улица:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Записване:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Наставка:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Работа"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Запазване на разговорите"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Публикуване"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Извличане"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber трафик</b>"
@@ -2106,30 +2221,165 @@ msgstr "_Съобщение"
 msgid "_Presence"
 msgstr "С_ъстояние"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Име:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Име:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Лични данни"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Промяна на акаунт..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Използване на различен хост/порт"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Име на опцията"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Стойност"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Няма)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Скрита"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Общи"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "зелена"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Местонахождение"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Курсив"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Публикуване"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2145,52 +2395,62 @@ msgstr ""
 "\n"
 "Осветяването на неправилно изписаните думи няма да се използва"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Разговори"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s: %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не предлага OpenPGP ключ и не сте задавали такъв"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Криптирането е включено"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Криптирането е изключено"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "не е в списъка"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2198,227 +2458,273 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Изключени"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Всеки %s _минути"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Активен"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "В момента няма връзка"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Първо получено съобщение"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Следващо получено съобщение"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Включване на контакт"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Изключване на контакт"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Изпратено съобщение"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Осветено съобщение в стая"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Непрочетени събития"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "За да смените името на акаунта, трябва да прочетете всички чакащи събития."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Името на акаунта вече се използва"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде под формата на „user@server“"
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт"
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Сега се връщам."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Свързване наново сега?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
 "наново."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr ""
+"Трябва първо да създадете акаунт и след това да редактирате личните данни."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Избор на OpenPGP ключ"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия OpenPGP ключ"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Сървър"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Нямате активен акаунт"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Името на акаунта вече се използва"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Списък с изритани"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Списък с членове"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Списък със собственици"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Списък с администратори"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Изритване..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2426,11 +2732,11 @@ msgstr ""
 "<b>Кого искате да изритате?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Добавяне на член..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2438,11 +2744,11 @@ msgstr ""
 "<b>Кого искате да направите член?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Добавяне на собственик..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2450,11 +2756,11 @@ msgstr ""
 "<b>Кого искате да направите собственик?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Добавяне на администратор..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2462,7 +2768,7 @@ msgstr ""
 "<b>Кого искате да направите администратор?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2478,87 +2784,88 @@ msgstr ""
 "4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
 "домейн/ресурс или адрес, съдържащ поддомейн."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт %s"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Нова стая"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Стая"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Трябва да въведете парола за новия акаунт."
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Дублиран Jabber ID"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Този акаунт вече е конфигуриран в Gajim."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2566,23 +2873,23 @@ msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Новият акаунт беше създаден успешно"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2590,176 +2897,197 @@ msgstr ""
 "Текстът под този ред е последното, което е казано откакто за последен път "
 "сте обърнали внимание на тази стая"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Действия за „%s“"
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Липсва „%s“ в URL на речника и не е WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в URL за търсене"
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "Преди %i дни"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "На този компютър няма инсталиран модул на Питон за D-Bus"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Възможностите за D-Bus не могат да бъдат използвани"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Име на контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "В групата"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "Номер на ключ"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Име на контакта"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Съобщение за състояние"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Запазване като настроено съобщение за състояние"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Напишете име за това съобщение за състояние"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Адрес:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Адрес:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Допълнителен адрес:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Транспорти"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Невалиден идентификатор"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Контактът вече е в списъка"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Контактът вече съществува в списъка."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber клиент"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Стари разработчици:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Стари разработчици:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "И не на последно място, бихме искали да благодарим на всички, които "
 "поддържат пакетите."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@doganov.org>\n"
@@ -2768,292 +3096,322 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr ""
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Искане за записване за акаунт „%s“ от %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Вече сте в стая „%s“"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая с акаунт „%s“"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Невалидна стая или име на сървър"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Невалиден Jabber ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Името на стаята или сървъра съдържат непозволени символи."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Въведете JID на контакта, до който\n"
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Ново съобщение"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Ново лично съобщение"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Нова е-поща"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Покана за раговор в стая"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Изключи се контакт"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
+msgstr "Еднократно съобщение с акаунт „%s“"
+
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "XML конзола"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Описание: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Формат на реда</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Формат на реда</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Лични разговори"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s ви покани в стая %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когато %s стане:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавяне на специално уведомление за %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Свързване"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Други"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Конференции"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Услугата не може да бъде намерена"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3061,46 +3419,51 @@ msgstr ""
 "Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
 "отново."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Услугата не е достъпна"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Този вид услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Търсене в %s от акаунт „%s“"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Търсене"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Сканиране на %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Потребители"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Описание"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Файл:"
@@ -3118,7 +3481,7 @@ msgstr "Напредък"
 msgid "Filename: %s"
 msgstr "Име на файл: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
@@ -3126,17 +3489,17 @@ msgstr "Размер: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Вие"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Получател: "
 
@@ -3157,78 +3520,88 @@ msgstr "Файловият трансфер е прекъснат"
 msgid "Connection with peer cannot be established."
 msgstr "Не може да бъде установен контакт с отсрещната машина."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Получател: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Грешка при четене на файл:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Файловият трансфер е преустановен от отсрещната страна"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Избор на файл за изпращане..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Неуспех при достъпа до този файл"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Този файл се използва от друг процес."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s иска да ви изпрати файл:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Този файл вече съществува"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Какво искате да направите?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Запазване на файла като..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3236,58 +3609,258 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Невалиден файл"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Изпращач: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Необходим е X сървър. Спиране на програмата..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim изисква PyGTK 2.6 или по-нова версия"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim изисква PyGTK 2.6 или по-нова версия. Спиране на програмата..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim изисква GTK 2.6 или по-нова версия"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim изисква GTK 2.6 или по-нова версия. Спиране на програмата..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "Липсва поддръжка на libglade за GTK+ runtime"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Премахнете текущата версия на GTK+ runtime и инсталирайте последната "
+"стабилна от %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Уверете се, че версиите на GTK+ и PyGTK на системата ви имат поддръжка за "
+"libglade."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim изисква PySQLite2"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim изисква PySQLite2"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) упълномощаване за „%s“ (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Приемате ли това запитване?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Свързване"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Тема: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "грешка при изпращане на %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Упълномощаването е прието"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Контактът „%s“ премахна записването за вас"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Винаги ще го виждате като изключен."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Не може да бъде установен контакт с „%s“"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Проверете връзката или опитайте отново по-късно."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s вече е %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Паролата е грешна"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "В момента сте свързани без OpenPGP ключ."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Ново писмо за %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Имате %d ново писмо"
+msgstr[1] "Имате %d нови писма"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s иска да ви изпрати файл."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Успешно получихте %(filename)s от %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Успешно изпратихте %(filename)s на %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Попълнете данните за нов акаунт</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Неуспех при запазването на настройките"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "Липсва поддръжка за управление на сесиите (модул gnome.ui)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "показване на помощ за специфична команда"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "показване на помощ за команда"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Показва или скрива списъка"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Показване на следващото непрочетено съобщение в изскачащ прозорец"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3295,49 +3868,49 @@ msgstr ""
 "Показване на списък с всички контакти. Всеки контакт се появява на отделен "
 "ред"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "акаунт"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "показва само контактите на дадения акаунт"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Показване на списък с регистрираните акаунти"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "състояние"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "едно от: offline (изключен), online (на линия), chat (свободен за разговор), "
 "away (отсъствам), xa (не съм на разположение), dnd (зает), invisible "
 "(невидим)"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "съобщение"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "съобщение за състояние"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3346,21 +3919,21 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "глобалното състояние“"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Показване на диалогов прозорец за разговор, за да може да се изпрати "
 "съобщение до контакта"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID на контакта, с който искате да разговаряте"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако е указано, контактът се взима от списъка с контакти на този акаунт"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3371,28 +3944,28 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID на контакта, който ще получи съобщението"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "текст на съобщението"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "OpenPGP ключ"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ако е указано, съобщението ще се криптира, използвайки този публичен ключ"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "ако е указано, съобщението ще бъде изпратено от този акаунт"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3403,128 +3976,143 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Тема"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Изпратено съобщение"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Получаване на подробна информация за контакта"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID на контакта"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Получаване на подробна информация за акаунта"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Име на акаунта"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Изпращане на файл до контакт"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Път до файл"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "ако е указано, файлът бъде изпратен от този акаунт"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Показва всички настройки и техните стойности"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Настройва стойността на „ключ“ на „стойност“."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "ключ=стойност"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "„ключ“ е името на настройката, „стойност“ е стойността, която се задава"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Изтрива обект от настройките"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "име на настройката з изтриване"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запазва текущото състояние на настройките във файла .config"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Добавяне на контакт към списъка"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Добавяне на нов контакт към този акаунт"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Връща текущото състояние (глобалното, в случай, че не е указан акаунт)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Връща текущото съобщение за състояние (глобалното, в случай, че не е указан "
 "акаунт)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Връща броя непрочетени съобщения"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "XML конзола"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3533,16 +4121,11 @@ msgstr ""
 "„%s“ не е в списъка ви.\n"
 "Укажете акаунт за изпращането на това съобщение."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Нямате активен акаунт"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Неизвестна версия на D-Bus: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3551,16 +4134,16 @@ msgstr ""
 "Употреба: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s не е намерен"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3569,7 +4152,7 @@ msgstr ""
 "Употреба: %s команда [аргументи]\n"
 "Командата е една от:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3578,330 +4161,136 @@ msgstr ""
 "Не е указан аргумент „%s“.\n"
 "Напишете „%s help %s“ за повече информация"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Необходим е X сървър. Спиране на програмата..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim изисква PyGTK 2.6 или по-нова версия"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim изисква PyGTK 2.6 или по-нова версия. Спиране на програмата..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim изисква GTK 2.6 или по-нова версия"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim изисква GTK 2.6 или по-нова версия. Спиране на програмата..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Липсва поддръжка на libglade за GTK+ runtime"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Премахнете текущата версия на GTK+ runtime и инсталирайте последната "
-"стабилна от %s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Уверете се, че версиите на GTK+ и PyGTK на системата ви имат поддръжка за "
-"libglade."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim изисква PySQLite2"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) упълномощаване за „%s“ (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Приемате ли това запитване?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "грешка при изпращане на %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Упълномощаването е прието"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Контактът „%s“ премахна записването за вас"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Винаги ще го виждате като изключен."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Не може да бъде установен контакт с „%s“"
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Проверете връзката или опитайте отново по-късно."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s вече е %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Паролата е грешна"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "В момента сте свързани без OpenPGP ключ."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Ново писмо за %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Имате %d ново писмо"
-msgstr[1] "Имате %d нови писма"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s иска да ви изпрати файл."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Успешно получихте %(filename)s от %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Успешно изпратихте %(filename)s на %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "Публикуването на визитката е успешно"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Личната информация беше публикувана успешно."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "Неуспех при публикуването на визитката"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Неуспех при запазването на настройките"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Липсва поддръжка за управление на сесиите (модул gnome.ui)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Мигриране на записите на разговорите..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Изчакайте, докато записите на разговорите се мигрират..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Тема"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "име на тема"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Не може да изтриете текущата тема"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Първо изберете друга като текуща тема."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Личен разговор"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Лични разговори"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Вече не сте в стая „%s“ или „%s“ е напуснал(а)."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Стая"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Стаи"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Смяна на псе_вдоним"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Няма тема за тази стая"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s беше изритан от %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s вече е познат като %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s сега е %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Псевдонимът не е намерен: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Няма тема за тази стая"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s е поканен в %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "„%s“ изглежда не е валиден JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Няма такава команда: /%s (ако искате да изпратите това, сложете представка /"
 "say)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Команди: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3913,7 +4302,7 @@ msgstr ""
 "Псевдонимът може да се замества, но не и ако съдържа „@“. Ако контактът е в "
 "стаята, той също ще бъде изритан. Не се поддържат интервали в псевдонима."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3921,12 +4310,12 @@ msgstr ""
 "Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
 "контакт."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Употреба: /%s, изчиства текстовия прозорец."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3935,12 +4324,12 @@ msgstr ""
 "Употреба: /%s [причина], затваря текущия прозорец или подпрозорец и показва "
 "причина, ако е указана."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Употреба: /%s, скрива бутоните за раговор."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3949,7 +4338,7 @@ msgstr ""
 "Употреба: /%s <JID> [причина], кани JID в текущата стая, причината е по "
 "избор."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -3958,7 +4347,7 @@ msgstr ""
 "Употреба: /%s <стая>@<сървър>[/псевдоним], предлага влизане в стая@сървър, "
 "използването на указания псевдоним е по избор."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3969,7 +4358,7 @@ msgstr ""
 "от стаята и евентуално показва причина. Не се поддържат интервали в "
 "псевдонима."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -3978,7 +4367,7 @@ msgstr ""
 "Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
 "трето лице (т.е. „/%s експлодира“)."
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -3987,22 +4376,22 @@ msgstr ""
 "Употреба: /%s <псевдоним> [съобщение], отваря прозорец за лично съобщение и "
 "изпраща съобщение до участника, указан с псевдонима."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "Употреба: /%s [тема], показва или актуализира темата на текущата стая."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Употреба: /%s [тема], показва или актуализира темата на текущата стая."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4010,160 +4399,160 @@ msgstr ""
 "Употреба: /%s <съобщение>, изпраща съобщение без да се имат предвид други "
 "команди."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Няма помощна информация за /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "Да _не се задава този въпрос отново"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Отметката вече е установена"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Стаята „%s“ вече присъства в отметките."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Може да организирате отметките чрез менюто „Действия“."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Изритване на %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Беше открита програмна грешка"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr ""
 "Вероятно не е фатална, но би трябвало да се докладва на разработчиците."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Докладване на грешка"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Подробности"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Грешка при анализиране на файл:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Неуспех при запис на %s. Поддръжката за управление на сесиите няма да работи"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Запазване на файла като..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Неуспех при откриването на базата от данни за разговорите"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Контакти"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Съобщение"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Тема"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4171,7 +4560,7 @@ msgstr ""
 "Искате ли да изчистите базата от данни? (ИЗОБЩО НЕ СЕ ПРЕПОРЪЧВА, АКО GAJIM "
 "Е СТАРТИРАН)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4185,131 +4574,172 @@ msgstr ""
 "\n"
 "В случай, че изберете „Да“, изчакайте..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Изнасяне на записите на разговорите..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s в %(time)s каза: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "кой"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Наистина ли искате да изтриете дневниците на избрания контакт?"
 msgstr[1] "Наистина ли искате да изтриете дневниците на избраните контакти?"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Това е необратима операция."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Наистина ли искате да изтриете избраното съобщение?"
 msgstr[1] "Наистина ли искате да изтриете избраните съобщения?"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История на разговорите с %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s вече е %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s вече е %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Съобщения"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s вече е %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s се включи"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s се изключи"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ново еднократно съобщение от %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Ново лично съобщение от стая %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ново съобщение от %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Неуспех при зареждането на изображението"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Получена покана"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "Трябва да сте свързани, за да публикувате визитката."
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "Неуспех при публикуването на визитката"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Трябва да сте свързани, за да изтеглите визитката"
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Вече сте в стая „%s“"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Не може да влезете в стая, докато сте невидими."
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "към акаунт „%s“"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "за акаунт „%s“"
@@ -4317,41 +4747,53 @@ msgstr "за акаунт „%s“"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "от акаунт „%s“"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Управление на отметките..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Мениджър на историята"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Влизане в нова стая"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Влизане в стая"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Имате непрочетени съобщения"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4359,69 +4801,88 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Транспортът „%s“ ще бъде премахнат"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
+"този транспорт."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Нова стая"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr ""
 "Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Пре_именуване"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "С_вързване"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "Изкл_ючване"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4429,7 +4890,7 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4437,36 +4898,51 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2334
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
-#: ../src/roster_window.py:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
+"ще ви вижда изключен."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Въведете парола за GPG ключ за акаунт „%s“."
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Запазване на паролата"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Грешна парола"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4474,20 +4950,21 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Jabber акаунт."
 
-#: ../src/roster_window.py:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Имате непрочетени съобщения"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4495,145 +4972,111 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Преместване на %s в група %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Създаване на %s и %s като мета-контакти"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Промяна на съобщението за състояние..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Скрива това меню"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d непрочетено съобщение"
-msgstr[1] "Gajim - %d непрочетени съобщения"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d непрочетено съобщение"
-msgstr[1] "Gajim - %d непрочетени съобщения"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d непрочетено съобщение"
-msgstr[1] "Gajim - %d непрочетени съобщения"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d непрочетено съобщение в стая"
-msgstr[1] "Gajim - %d непрочетени съобщения в стаи"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d непрочетено лично съобщение"
-msgstr[1] "Gajim - %d непрочетени лични съобщения"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Роля: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Връзка: "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Състояние: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Записване: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Състояние: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Последно състояние на %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "От %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "от %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Изтегляне"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Качване"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Прехвърлени: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Не е започнал"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Преустановен"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Завършил"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Блокирал"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Прехвърляне"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Тази услуга все още не е отговорила с подробна информация"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4641,25 +5084,25 @@ msgstr ""
 "Тази услуга не можа да отговори с подробна информация.\n"
 "Най-вероятно е остаряла или повредена"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Неуспех при зареждането на изображението"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "от %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Връзка: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4667,7 +5110,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4675,13 +5118,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
 #. None
-#: ../src/vcard.py:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4689,27 +5132,15 @@ msgstr ""
 "Вие не се интересувате от информацията за състоянието на контакта, както и "
 "той от вашата"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: ../src/vcard.py:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
-#: ../src/vcard.py:458
-msgid "Without a connection you can not publish your contact information."
-msgstr "Трябва да сте свързани, за да публикувате визитката."
-
-#: ../src/vcard.py:491
-msgid "Without a connection, you can not get your contact information."
-msgstr "Трябва да сте свързани, за да изтеглите визитката"
-
-#: ../src/vcard.py:495
-msgid "Personal details"
-msgstr "Лични данни"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "създаване на база от данни за разговорите"
 
@@ -4734,96 +5165,90 @@ msgstr "%s e папка, а би трябвало да е файл"
 msgid "creating %s directory"
 msgstr "създаване на папка %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-"Липсва зависимостта pysqlite2 (също познато и като python-pysqlite2). "
-"Спиране на програмата..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Услугата не е налична: Gajim не е стартиран или remote_control е „False“"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Липсва „session bus“.\n"
-"Опитайте се да прочетете http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Използвайте DBus и Notification-Daemon за показване на уведомленията"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Автоматично състояние поради липса на активност"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Време в минути, след което състоянието да се променя на „Не съм на "
 "разположение“."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Автоматично състояние поради липса на активност"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Тълкуване на двойки от „* / _“ като възможни символи за форматиране."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ако е „True“, не се премахват */_. Така *абв* ще е в получер стил, но със "
 "символите * *."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Добавяне на * и [n] към заглавието на списъка?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4831,21 +5256,21 @@ msgstr ""
 "Колко реда от предишния разговор да за запомнят при повторното отваряне на "
 "подпрозорец/прозорец."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колко минути да отделят последните редове от предишния разговор."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "Изпращане на съобщение при Ctrl+Enter и нов ред с Enter."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4854,23 +5279,23 @@ msgstr ""
 "Или определен адрес съдържащ %s, където %s е думата/фразата, или "
 "'WIKTIONARY', което означава използване на wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
 "remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4878,7 +5303,7 @@ msgstr ""
 "Винаги да се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4886,7 +5311,7 @@ msgstr ""
 "Никога да не се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4894,24 +5319,24 @@ msgstr ""
 "Превъзмогва хоста при файлов трансфер в случай, че се ползва NAT/"
 "пренасочване на портове."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Според стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Показване на подпрозорец при един разговор?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показване на границата на подпрозореца при един разговор?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Показване на бутона за затваряне на подпрозореца?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4919,7 +5344,7 @@ msgstr ""
 "Списък с думи, отделени с точка и запетая, които ще се осветяват при "
 "разговор в стая."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4928,11 +5353,11 @@ msgstr ""
 "администратора на прозорци. Тази настройка е валидна само ако се използва "
 "иконата в областта за уведомяване."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Ако е „True“, Gajim регистрира xmpp:// при всяко стартиране."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4940,15 +5365,16 @@ msgstr ""
 "Ако е „True“, ще се изобразява икона във всеки подпрозорец, съдържащ "
 "непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Ако е „True“, ще се показва съобщението за състояние, ако има такова, на "
 "всеки контакт под името му списъка."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4956,7 +5382,7 @@ msgstr ""
 "Ако е „True“, ще се изпраща запитване за аватар до всеки контакт, който е "
 "нямал такъв последния път или пък има остарял кеширан аватар."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4965,20 +5391,29 @@ msgstr ""
 "Ако е „False“, вече няма да виждате реда за състоянието при разговорите, "
 "когато контактът променя състоянието си."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4988,17 +5423,19 @@ msgstr ""
 "ще мига (стандартното поведение при повечето администратори на прозорци) при "
 "задържане на чакащи събития."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 не харесва информация от тип SHA при включване в стая, защитена с "
 "пароли. Настройте тази опция на „False“, за да спрете да изпращате "
 "информация от тип SHA при присъствие в стаи"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5006,7 +5443,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Контролира прозореца, където се отварят нови съобщения.\n"
 "„always“ - Всички съобщения се отварят в един прозорец.\n"
@@ -5016,53 +5453,68 @@ msgstr ""
 "специфичен прозорец. Забележете, че промяната на тази опция изисква "
 "рестартирането на Gajim, за да влезе в сила"
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ако е „False“, повече няма да виждате аватар в прозореца за разговор"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Ако е „True“, натискането на клавиша „Escape“ затваря прозореца/подпрозореца"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Скрива бутоните в прозореца на стаята"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Скрива бутоните в прозорец за разговор с два контакта"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Скрива лентата в прозореца на стаята"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Скрива лентата в прозорец за разговор с два контакта"
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "Скрива списъка на участниците в прозореца на стаята"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Заобикалка заради Jabberd2"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5070,59 +5522,106 @@ msgstr ""
 "Ако тази опция е избрана, ще се използва вашият IP адрес и сървърите-"
 "посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP не може да бъде използван на този компютър"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Спя"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, оставете съобщение."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Навън"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Наслаждавам се на живота навън"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "На линия"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Свободен за разговор"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Не съм на разположение"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5130,7 +5629,7 @@ msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "muc_higlighted_words или когато съобщение съдържа псевдонима ви."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5139,98 +5638,208 @@ msgstr ""
 "в стаята. (Тази настройка е валидна само ако notify_on_all_muc_messages е "
 "„True“)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "колониална"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "хуманна"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "синя"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Грешна парола"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Псевдонимът не е намерен: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1515
+#, fuzzy
+msgid "You are banned from this room."
+msgstr "Вече сте в стая „%s“"
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1527
+#, fuzzy
+msgid "You are not in the members list."
+msgstr "Не сте свързани към сървъра."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr ""
+"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
+"roster."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy, python-format
+msgid "unsubscribe request from %s"
+msgstr "Искане за записване от %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "За да продължите да изпращате и получавате съобщения, трябва да се свържете "
 "наново."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Транспортът „%s“ отговори погрешно на запитването за регистрация."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Невалиден отговор"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не може да се осъществи свързване с „%s“"
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Свързан към сървър %s:%s с %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Проверете връзката или опитайте отново по-късно"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "Не беше зададена парола за OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "невидим"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "изключен"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "%s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Това съобщение е криптирано]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5239,298 +5848,561 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
 msgstr ""
-"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
-"roster."
 
-#: ../src/common/connection_handlers.py:49
-msgid "Unable to load idle module"
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "На този компютър няма инсталиран модул на Питон за D-Bus"
+
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Възможностите за D-Bus не могат да бъдат използвани"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
+"Липсва зависимостта pysqlite2 (също познато и като python-pysqlite2). "
+"Спиране на програмата..."
 
-#: ../src/common/connection_handlers.py:581
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Услугата не е налична: Gajim не е стартиран или remote_control е „False“"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Липсва „session bus“.\n"
+"Опитайте се да прочетете http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Няма"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "кой"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Улица:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Порт: "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "файл"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Събитие"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "П_родължаване"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Изтриване"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "Registration information for transport %s has not arrived in time"
+msgid "%0 o'clock"
 msgstr ""
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1454
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 #, fuzzy
-msgid "You are banned from this room."
-msgstr "Вече сте в стая „%s“"
+msgid "ten to %1"
+msgstr "Регистриране в %s"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
+#: ../src/common/fuzzyclock.py:62
 #, fuzzy
-msgid "You are not in the members list."
-msgstr "Не сте свързани към сървъра."
+msgid "Morning"
+msgstr "Работя"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
 msgstr ""
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Няма"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1521
-#, fuzzy, python-format
-msgid "unsubscribe request from %s"
-msgstr "Искане за записване от %s"
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Събитие"
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
 msgstr ""
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Невалиден символ в потребителското име."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Необходим е адрес на сървъра."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Невалиден символ в името на хоста."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Невалиден символ в ресурса."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Зает"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Зает"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Не съм на разположение"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Не съм на разположение"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Свободен за разговор"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "На _линия"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "На линия"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Свързване"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "_Отсъствам"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Отсъствам"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Изключен"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Изключен"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "Не_видим"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "Неизвестно"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "Има грешки"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "От"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Двустранно"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Записване"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "Не е установен"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Председатели"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Председател"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Участници"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Посетител"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Не е установен"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "Со_бственик"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Администратор"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Член"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "обръща внимание на разговора"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "прави нещо друго"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "пише съобщение..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "спря да пише съобщение"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d непрочетено съобщение"
+msgstr[1] "Gajim - %d непрочетени съобщения"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d непрочетено съобщение"
+msgstr[1] "Gajim - %d непрочетени съобщения"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d непрочетено съобщение в стая"
+msgstr[1] "Gajim - %d непрочетени съобщения в стаи"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d непрочетено лично съобщение"
+msgstr[1] "Gajim - %d непрочетени лични съобщения"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "грешка: %s не може да бъде отворен за четене"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "синьозелена"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "създаване на база от данни за разговорите"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "за акаунт „%s“"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Неуспех при зареждането на изображението"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Не може да се осъществи свързване с „%s“"
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Това съобщение е криптирано]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Записване"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Адрес"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Отсъствам"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Изтегляне"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Добавяне на специално уведомление за %s"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Не съм на разположение"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Изтриване"
+
+#~ msgid "Contact _Info"
+#~ msgstr "_Данни за контакта"
+
+#~ msgid "Contact Information"
+#~ msgstr "Данни за контакта"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Невалидна стая или име на сървър"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Неизвестна версия на D-Bus: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "Публикуването на визитката е успешно"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Личната информация беше публикувана успешно."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Мигриране на записите на разговорите..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Изчакайте, докато записите на разговорите се мигрират..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Влизане в нова стая"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Скрива това меню"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d непрочетено съобщение"
+#~ msgstr[1] "Gajim - %d непрочетени съобщения"
+
+#~ msgid "Since %s"
+#~ msgstr "От %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Автоматично упълномощаване на контакта"
 
diff --git a/po/br.po b/po/br.po
index 4d93433c3..415559066 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,12 +7,12 @@
 # , 2005.
 #
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -23,15 +23,15 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "Ur flaperez Jabber e GTK+"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Flaperez Gajim"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Flaperez Jabber"
 
@@ -48,16 +48,23 @@ msgid "_Discover Services..."
 msgstr "_Dizoleiñ ar servijoù..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Webkaozioù"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Kemmañ ar gont..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Digeriñ ar bostelerez"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stad"
 
@@ -111,7 +118,7 @@ msgid "Pass_word:"
 msgstr "_Ger-kuzh:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Enrollañ ar _ger-kuzh"
 
@@ -137,7 +144,7 @@ msgid "Your JID:"
 msgstr "Ho JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Mont pelloc'h"
 
@@ -151,7 +158,7 @@ msgid "_Host:"
 msgstr "_Ostiz:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Ger-kuzh:"
 
@@ -183,10 +190,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>A bep seurt</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Titouroù hiniennel</b>"
 
@@ -203,6 +212,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Adkevreañ war-eeun pa vez kollet ar gevreadenn"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "K_evreañ en ur loc'hañ Gajim"
 
@@ -223,6 +233,7 @@ msgstr ""
 "vous désactivez le TLS"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Dibabit un _alc'hwezh..."
 
@@ -239,16 +250,16 @@ msgid "Edit Personal Information..."
 msgstr "Kemmañ an titouroù hiniennel..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Hollek"
 
@@ -274,6 +285,7 @@ msgstr ""
 "pour prévenir des temps de latence pouvant entraîner des déconnexions"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -282,6 +294,7 @@ msgstr ""
 "config avec accès en lecture pour vous uniquement"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -290,6 +303,7 @@ msgstr ""
 "loc'hañ"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -306,18 +320,23 @@ msgstr "Titouroù diwar ho penn, miret war ar servijer"
 msgid "Manage..."
 msgstr "Kemmañ..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Alc'hwez ebet diuzet"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Hini ebet"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Titouroù hiniennel"
 
@@ -337,14 +356,18 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proksi:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -353,40 +376,46 @@ msgid ""
 "has the highest priority will get the events. (see below)"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "_Enrollañ ar ger-kuzh (diasur)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Enrollaén an _istoradur-flapiñ evit an holl zarempredoù"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Kas ar pakadoù derc'hel al lugadenn vev"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Implij _SSL"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Implij un anv ostiz/porzh personelaet"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Implij ar proksioù evit treuzkas restroù"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Anv:"
 
@@ -396,63 +425,92 @@ msgstr "Kontoù"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "M'ho peus daou gont pe ouzhpenn hag eo diuzet, e vo strollet an holl "
 "zarempredoù evel pa vefe ur gont hepken"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Strollañ ar c'hontoù"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Kemmañ"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Dilemel"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Kont"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "He/E aotren da welet ma stad"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Ouzhpennañ un darempred nevez"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Kont"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Strollad:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Lesanv:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protokol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Koumanantiñ"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "_Emezelañ"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "ID arveriad-ez:"
@@ -544,81 +602,62 @@ msgstr "<b>Sonioù</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Chomlec'h"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "Actions a_vancées"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Aozer kefluniañ dre ar munut"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Stad:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Ezvezant"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 msgid "Busy "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Pellgargañ"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Diwelus"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "urzhiad"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Dihegerz"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Prest da flapiñ"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "_Seniñ"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -631,75 +670,75 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Utiliser une seule fenê_tre de discussion avec des onglets"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Diskouez er _roll hepken"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Diskouez er _roll hepken"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Porzh:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -735,7 +774,7 @@ msgstr "Ebarzhiñ ur _webgaoz"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Ouzhpennañ er roll"
 
@@ -756,7 +795,8 @@ msgid "_Open Link in Browser"
 msgstr "_Digerién an ere er furcher web"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Kregiñ da flapiñ"
@@ -766,7 +806,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Klikit amañ evit gwelout kaozioù kent gant an darempred-mañ"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Kas ur _restr"
 
@@ -782,7 +823,8 @@ msgstr ""
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Istoradur"
 
@@ -846,7 +888,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "P'eo echu un treuzkas, diskouez ur gemennadenn gelaouiñ difoupus"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Kenderc'hel"
 
@@ -883,39 +925,34 @@ msgstr ""
 "Titl"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Oberiant"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Tev"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "O skrivañ"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Neuz an nodrezh:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Personelaat gwiskadurioù Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Aet kuit"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Dizoberiant"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Stouet"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -923,7 +960,7 @@ msgstr ""
 "Kemennadennoù\n"
 "webgaoz"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -932,19 +969,19 @@ msgstr ""
 "kaset davet\n"
 "webkaozioù"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Ehan"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "_Liv ar skrid:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "_Nodrezh ar skrid:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Drekleur:"
 
@@ -1056,7 +1093,7 @@ msgid "Accept"
 msgstr "Asantiñ"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Nac'hañ"
 
@@ -1064,13 +1101,14 @@ msgstr "Nac'hañ"
 msgid "Invitation Received"
 msgstr "Resevet ar bedadenn"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Lesanv:"
 
@@ -1088,13 +1126,8 @@ msgstr "Nevez 'zo:"
 msgid "Room:"
 msgstr "Webgaoz:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Servijer:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "E_barzhiñ"
 
@@ -1119,6 +1152,10 @@ msgstr "Merañ ar sinedoù"
 msgid "Print status:"
 msgstr "Diskouez an eur:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Servijer:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Titl:"
@@ -1140,7 +1177,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Merañ an aeladoù proksi"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Anv:"
 
@@ -1156,20 +1194,21 @@ msgstr "Implij an diskleriañ"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "Encryption OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Oberoù"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Kas"
 
@@ -1242,18 +1281,25 @@ msgid "Also known as iChat style"
 msgstr "Anvet ivez stil iChat"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Goulenn an titour-stad pa:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Bezañ lakaet da _ezvezant war-lerc'h:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Bezañ lakaet evel _dihegerz war-lerc'h:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1265,19 +1311,19 @@ msgstr ""
 "Toujours utiliser les applications par défaut de KDE\n"
 "Personnalisé"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "_A-raok al lesanv:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Flap"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Titou_roù-stad ar flap:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1287,35 +1333,40 @@ msgstr ""
 "vous spamme/ennuie. Utilisez la avec précaution, car elle bloque tous les "
 "messages des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Titour-stad"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "_Arlunioù-stad dre-ziouer:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Diskouez titouroù-stad an darempredoù e-barzh ar roll"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "_Bep 5 munutenn"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Boulomelloù:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Darvoudoù"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1325,14 +1376,14 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quel état de conversation vous voulez envoyer à vos contacts"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Gajim montrera automatiquement les nouveaux évènements reçus en montrant la "
 "fenêtre correspondante"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1340,7 +1391,7 @@ msgstr ""
 "Gajim vous signalera les nouveaux évènements dans une fenêtre en bas à "
 "droite de l'écran"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1348,7 +1399,7 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est connecté"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1356,13 +1407,19 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est déconnecté"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim ne fera que changer l'icône du contact qui a envoyé le nouvel évènement"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1370,7 +1427,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1378,7 +1435,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1386,7 +1443,7 @@ msgstr ""
 "Si cette case est cochée, Gajim va retenir la position de votre liste "
 "decontacts et des fenêtres de discussion pour vos prochaines utilisations"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1396,7 +1453,7 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent, occupé, etc)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1404,11 +1461,11 @@ msgstr ""
 "M'eo lazhet, ne vo ket erlec'hiet ar voulomelloù ascii doare ':)' gant "
 "boulomelloù grafikel fiñv pe difiñv"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "Me_rañ..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1420,80 +1477,84 @@ msgstr ""
 "Dre gont\n"
 "Dre zoare"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Ma c'helaouiñ evit ar c'hemennadennoù _Gmail nevez"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "Da _bep kemennadenn:"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "Ur prenestr-flapiñ:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "_Seniñ"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Penndibaboù"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Diskouez an eur:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "_Mirout lec'hiadur ha ment ar roll hag ar prenistri-flapiñ"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Diskouez er _roll hepken"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_Lugañ"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_Dilugañ"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Stad"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "_Gwiskadur:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "An emc'hemennadenn evit ar stad \"Ezvezant\""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "An emc'hemennadenn evit ar stad \"Dihegerz\""
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Implij arlunioù an _dorioù"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Implij an arlun-gelaouiñ (trayicon)"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1505,151 +1566,160 @@ msgstr ""
 "ec'h erru darvoudoù evit kemennadennoù nevez m'int bet kaset gant un "
 "darempred n'emaoc'h ket o flapién gant-añ/-i."
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Pa resever un darvoud nevez"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Aozer kefluniañ dre ar munut"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "_War-lerc'h an eur:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "_A-raok an eur:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Furcher web:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "Merour _restroù:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Nodrezh:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Islinennañ ar fazioù reizhskrivañ"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Chom hep teurel pled eus ar c'hemennadennoù kaset gant tud dianav"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "Kemennadenn o _tegouezhout:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Meziant posteliñ:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Morse"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Kelaouiñ ac'hanon"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Digeriñ..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "Kemennadenn o _vont 'maez:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Soner:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "Di_foupañ"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "_Distreiñ gant al livioù dre-ziouer"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "_Urzhiañ an darempredoù hervez o stad"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "_Titour-stad:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL :"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "munutenn"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Flapoù prevez"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "K_evreañ en ur loc'hañ Gajim"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Dilemel"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "ID Jabber:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Servijer:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Roll argas"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Koumanant"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "Er strollad"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1657,32 +1727,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Kas ur gemennadenn"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Goulenn evit gwelet e/he stad"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "He/E aotren da welet ma stad"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Diwar-benn"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Chomlec'h"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Dibab ur _skeudenn"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Deiz-ha-bloaz:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Kêr:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Embregerezh:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Bro:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Departamant:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Postel:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Chomlec'h 2:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Familh:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Stumm : BBBB-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Anv bihan:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Lec'hienn hiniennel:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Eil anv bihan:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Muioc'h"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Titouroù hiniennel"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Pellgomz:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Plas:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Kod postel:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Rakger:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Perzh:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Stad:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Straed:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Lostger:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Labour"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Embann"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Kargañ"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1702,47 +1912,58 @@ msgid "A_sk to see his/her status"
 msgstr "Goulenn evit gwelet e/he stad"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Ouzhpennañ ur gelaouenn _ispisial"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Kemmañ ar _strolladoù"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Kas ur gemennadenn _simpl"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Kregiñ da _flapiñ"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "He/E aotren da welet ma stad"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Difenn dezhañ/dezhi gwelet ma stad"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Dilemel diouzh ar roll"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Adenvel"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Koumanant"
 
@@ -1767,42 +1988,52 @@ msgid "Help online"
 msgstr "Skoazell enlinenn"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Aelad, Avatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Dorioù"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Endalc'hadoù"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Dizoleiñ ar servijoù"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Aozañ"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Skoazell"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Penndibaboù"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Kuitaat"
 
+#: ../data/glade/roster_window.glade.h:21
+msgid "_View"
+msgstr ""
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Mont"
@@ -1872,23 +2103,19 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Aotren an darempred da welet hag emaon kevreet pe get"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "_Titouroù"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Nac'hañ aotre an darempred evit ma ne welo ket hag eñ oc'h kevreet pe get"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Goulenn koumanantiñ"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Aotren"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Nac'hañ"
 
@@ -1904,164 +2131,51 @@ msgstr "Diskouez ar _roll-darempredoù"
 msgid "Sta_tus"
 msgstr "S_tad"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Diwar-benn"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Chomlec'h"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Goulenn:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Deiz-ha-bloaz:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Kêr:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Poellad:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Embregerezh:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Titouroù"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Bro:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Departamant:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "Postel:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Chomlec'h 2:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Familh:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Stumm : BBBB-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Anv bihan:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Lec'hienn hiniennel:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Darempredoù"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "ID Jabber:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Chomlec'h"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Eil anv bihan:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Muioc'h"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Pellgomz:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Plas:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Kod postel:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Rakger:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Perzh:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Dibab ur _skeudenn"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Stad:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stad:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Straed:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Koumanant:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Lostger:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Labour"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Istoradur flapiñ"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Embann"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Kargañ"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr ""
@@ -2093,30 +2207,165 @@ msgstr "_Kemennadenn"
 msgid "_Presence"
 msgstr "_Bezañs"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Anv:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Anv:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Titouroù hiniennel"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Kemmañ ar gont..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Implij un anv ostiz/porzh personelaet"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Dibab"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Talvoud"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Doare"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Hini ebet)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Elfennoù kuzh"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Hollek"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "Glas"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Chomlec'h"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Stouet"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Embann"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2126,54 +2375,64 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "N'eus ket tu da gas ho kemennadenn keit ha ma n'oc'h ket luget."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Flapoù"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s : %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "N'eus bet kaset alc'hwezh OpenPGP ebet gant %s, ha n'o peus roet hini ebet "
 "dezhañ"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "War enaou emañ ar sifrañ"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "Ket er roll"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "O paouez resev ur gemennadenn nevez digant \"%s\" emaoc'h"
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2181,81 +2440,97 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Dizoberiant"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Bep %s _munutenn"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Oberiant"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Darvoud"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "N'eus ket tu da gevreañ"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Kemennadenn gentañ"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Darempred luget"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Darempred diluget"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Kemennadenn gaset"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Luget oc'h d'ar servijer"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Rankout a rit bezañ diluget evit cheñch anv ar gont."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Darvoudoù chomet dilenn"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Rankout a rit lenn an holl zarvoudoù-mañ evit gellout cheñch anv ar gont."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2263,144 +2538,173 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Anv-kont direizh"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "N'hell ket anv ar gont chom goullo."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "N'hell ket anv ar gont kaout esaouennoù."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber a rank bezañ er stumm \"anv@anvservijer\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Road direizh"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Adlugañ bremañ?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Ret eo deoc'h adlugañ evit ma vo sevenet an holl gemmoù diouzhtu."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Kont dihegerz"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr "Rankout a rit krouiñ ho kont a-raok kemmañ an titouroù hiniennel."
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Rankout a rit bezañ luget evit kemmañ ho titouroù hiniennel."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "Rankout a rit krouiñ ho kont a-raok kemmañ an titouroù hiniennel."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Bez ez eus bet ur gudenn en ur gargañ hoc'h alc'hwezhioù-kuzh OpenPGP."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Anv"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Servijer"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "N'ho peus kont bev ebet"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Anv-kont implijet dija"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Kemmañ %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Emezelañ war %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Roll argas"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Roll an izili"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Roll ar perc'hennerien"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Roll ar verourien"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Abeg"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Lesanv"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Perzh"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Oc'h argas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2408,11 +2712,11 @@ msgstr ""
 "<b>Piv a fell deoc'h argas ?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Oc'h ouzhpennañ un ezel..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2420,11 +2724,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da ezel ?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Oc'h ouzhpennañ ur perc'henn..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2432,11 +2736,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da berc'henn ?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Oc'h ouzhpennañ ur v-merour-ez..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2444,7 +2748,7 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da verour-ez ?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2461,89 +2765,90 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Lemel ar gont %s"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Sal-flapiñ nevez"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Flap a-stroll"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Bez ez eus titouroù direizh er sined-mañ"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Gwiriekait ho peus leuniet an takadoù servijer ha sal-flapiñ pe lamit ar "
 "sined-mañ."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Rankout a rit reiñ un anv-arveriad-ez evit kefluniañ ar gont-mañ."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Ger-kuzh direizh"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Rankout a rit reiñ ur ger-kuzh evit enrollañ ar gont nevez."
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Rankout a ra an daou c'her-kuzh bezañ heñvel en daou dakad."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Eilañ an ID Jabber"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Kefluniet eo bet ar gont-mañ e-barzh Gajim dija."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2552,23 +2857,23 @@ msgstr ""
 "Araoket, pe hen ober diwezhatoc'h en ur glikañ war Kontoù er meuziad Aozañ "
 "eus ar prenestr pennañ."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2576,466 +2881,516 @@ msgstr ""
 "Dindan al linenn e welit ar pezh a zo bet lâret er sal-flapiñ dibaoe ar wech "
 "diwezhañ ho peus taolet ur sell ennañ."
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Oberoù evit \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Mankout a ra un \"%s\" e-barzh URL ar geriaoueg, ha n'eo ket WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Mankout a ra un \"%s\" e-barzh URL ar webklask"
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Web_klask"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Dec'h"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "%i devezh 'zo"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
 
-# Traduction moins mauvaise mais pas terrible: binding=lier, attacher
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr ""
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr ""
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Anv an darempred: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Strollad"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "Er strollad"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Anv an darempred"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "Titour-stad %s"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Enrollañ evel titour-stad rakenrollet"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Roit un anv d'an titour-stad-mañ"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Chomlec'h:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Chomlec'h:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Chomlec'h 2:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Leuniit titouroù an darempred a zo da vezañ ouzhpennet er gont %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Leuniit an titouroù diwar-benn an darempred da ouzhpennañ"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Dorioù"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "ID-arveriad-ez direizh"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Darempred er roll dija"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Emañ an darempred en ho roll-darempredoù dija."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "ID arveriad-ez:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "Ur flaperez jabber e GTK+"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "TRUGAREZ DA:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Evit echuiñ, e fell deomp trugarekaat holl gempennerien ar pakad."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr ""
 "Troet e brezhoneg gant\n"
 "Giulia Fraboulet <djoulia@gmail.com>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Goulenn enskrivañ evit ar gont %s digant %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Goulenn enskrivañ digant %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Emaoc'h er webgaoz %s dija"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ebarzhiñ ur sal-flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Anv sal pe servijer direizh"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Kregiñ da flapiñ"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Roit ID an darempred a fell deoc'h kas ur gemennadenn\n"
 "dezhañ:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Rankout a rit reiñ ur ger-kuzh."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Darempred luget"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Kemennadenn nevez"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Kemennadenn simpl nevez"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Kemennadenn hiniennel nevez"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Darempred diluget"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
+msgstr "Kemennadenn simpl gant ar gont %s"
+
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Kemennadenn simpl"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Kas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "%s resevet"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr ""
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Taolennadur: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Dibabit ur son"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "An holl restroù"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Sonioù wav"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Dibabit ur skeudenn"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Skeudennoù"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Pa teu %s da vezañ:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Kevreadenn"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Traoù all"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Kendiviz"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Rankout a rit bezañ luget evit gellout furchal er servijoù hegerz"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Merañ servijoù ar gont %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Merañ ar servijoù"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "N'eo ket bet kavet ar servij"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3043,46 +3398,51 @@ msgstr ""
 "N'eus servij ebet er chomlec'h roet, pe ne respont ket. Gwiriekait ar "
 "chomlec'h ha klaskit en-dro."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "N'eus ket tu furchal er servij"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal e seurt servijoù."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "O furchal e-barzh %s oc'h implij ar gont %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Furchal"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal er servij-mañ."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "_Emezelañ"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Arveridi"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Taolennadur"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Restr"
@@ -3100,7 +3460,7 @@ msgstr "Araokadur"
 msgid "Filename: %s"
 msgstr "Anv ar restr: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Ment: %s"
@@ -3108,17 +3468,17 @@ msgstr "Ment: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "C'hwi"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Kaser: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Resever:"
 
@@ -3139,78 +3499,88 @@ msgstr "Nullet eo bet an treuzkas"
 msgid "Connection with peer cannot be established."
 msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Resever:"
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Fazi en ur lenn ar restr:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Arsavet eo bet an treuzkas gant ho tarempred"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Dibabit ur restr da gas..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "N'hell ket Gajim tizhout ar restr-mañ"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Implijet eo ar restr-mañ gant ur poellad all."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Restr: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Doare: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Taolennadur: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Enrollañ ar restr dindan..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3218,104 +3588,305 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Restr direizh"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Restr:"
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Anv:"
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Kaser:"
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Ehan"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Ezhomm en deus Gajim eus ur servijer X evit labourat. O kuitaat..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr ""
+"Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr ""
+"Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr ""
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Dilamit al levraoueg red eus GTK+runtime ha staliit an aozadur stabil "
+"diwezhañ diwar %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "Aotre HTTP (%s) evit %s (id : %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Degemer a rit ar goulenn-mañ?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Kevreadenn"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Sujed: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "fazi en ur gas %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Aotre degmeret"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Aotreet oc'h bet gant \"%s\" da welet e stad."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Dilamet eo bet ho aotre digant \"%s\""
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Atav e weloc'h anezhañ ezlinenn."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "N'eus ket tu da dizhout \"%s\""
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s a zo bremañ %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Direizh eo ho ker-kuzh"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Postel nevez war %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Bez ho peus %d postel nevez"
+msgstr[1] "Bez ho peus %d postel nevez"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "Fellout a ra da %s kas deoc'h ur restr."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Gant berzh ho peus resevet %(filename)s digant %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Gant berzh ho peus kaset %(filename)s da %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "diskouez ar skoazell evit un urzhiad resis"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "urzhiad"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "diskouez ar skoazell evit an urzhiad"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "A zifoup ur prenestr gant ar gemennadenn dilenn da-heul"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr ""
 "A ziskouez ur roll eus an holl zarempredoù, pep darempred war ul linenn."
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "kont"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "diskouez darempredoù ar gont roet hepken"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "A ziskouez roll ar c'hontoù enrollet"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "stad"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "unan eus: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "kemennadenn"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "titour stad"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3323,21 +3894,21 @@ msgstr ""
 "A cheñch stad ar gont \"kont\". Ma n'eus hini ebet roet, klaskit cheñch stad "
 "an holl gontoù o deus an dibab \"sync with global status\" enaouet"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "A ziskouez ar prenestr flapiñ evit ma c'hellfec'h kas ur gemennadenn d'un "
 "darempred"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID an darempred ho peus c'hoant flapiñ gantañ"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3348,27 +3919,27 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "korf ar gemennadenn"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "alc'hwezh pgp"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "Ma vez resisaet, e vo kaset ar gemennadenn en ur implij ar gont-mañ"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3379,128 +3950,142 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Titl"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Kemennadenn gaset"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Evit kargañ titouroù-munut un darempred"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID an darempred"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Evit kargañ titouroù-munut ur gont"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Anv ar gont"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Kas ur restr d'un darempred"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "restr"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Treug ar restr"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "m'eo resisaet, e vo kaset ar rest en ur implij ar gont-mañ"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Roll an holl zibaboù hag o zalvoudoù"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "A laka talvoud an 'alc'hwezh' da 'dalvoud'."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "alc'hwezh=talvoud"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'alc'hwezh' eo anv an dibab, 'talvoud' eo an talvoud da lakaat dezhañ"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "A zilam un elfenn dibab"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "touchenn"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "anv an dibab da zilemel"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "A skriv stad red dibaboù Gajim er restr .config"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Ouzhennañ an darempred d'ar roll"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Ouzhpennañ un darempred nevez d'ar gont-mañ."
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "A ro ar stad red (an hini hollek, nemet ez eus bet resisaet ur gont bennak)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "A gas an titour-stad red (an hini hollek, nemet ez eus bet resisaet ur gont "
 "bennak)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "A ro an niver a gemennadennoù chomet dilenn"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+msgid "XML to send"
+msgstr ""
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3509,16 +4094,11 @@ msgstr ""
 "N'emañ ket '%s' en hor roll darempredoù.\n"
 "Resisait ar gont evit kas ur gemennadenn."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Aozadur D-Bus dianav: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3527,16 +4107,16 @@ msgstr ""
 "Implij: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "N'eo ket bet kavet %s"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3545,338 +4125,142 @@ msgstr ""
 "Implij: %s urzhiad [arguments]\n"
 "urzhiad eo unan eus :\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 msgstr ""
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Ezhomm en deus Gajim eus ur servijer X evit labourat. O kuitaat..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr ""
-"Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr ""
-"Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr ""
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Dilamit al levraoueg red eus GTK+runtime ha staliit an aozadur stabil "
-"diwezhañ diwar %s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Aotre HTTP (%s) evit %s (id : %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Degemer a rit ar goulenn-mañ?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "fazi en ur gas %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Aotre degmeret"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Aotreet oc'h bet gant \"%s\" da welet e stad."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Dilamet eo bet ho aotre digant \"%s\""
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Atav e weloc'h anezhañ ezlinenn."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "N'eus ket tu da dizhout \"%s\""
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s a zo bremañ %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Direizh eo ho ker-kuzh"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Postel nevez war %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Bez ho peus %d postel nevez"
-msgstr[1] "Bez ho peus %d postel nevez"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "Fellout a ra da %s kas deoc'h ur restr."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Gant berzh ho peus resevet %(filename)s digant %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Gant berzh ho peus kaset %(filename)s da %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "Gant berzh eo bet embannet ar vCard"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Gant berzh eo bet embannet ho titouroù hiniennel."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "C'hwitet eo embannadur ar vCard"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
-"diwezhatoc'h."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "O tilec'hiañ an istoradur..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Gwiskadur"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "anv ar gwiskadur"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "N'hellit ket dilemel ar gwiskadur red"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Dibabit ur gwiskadur all da gentañ."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Flap prevez"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Flapoù prevez"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "N'emaoc'h ket er webgaoz \"%s\" ken, pe neuze eo aet kuit \"%s\"."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Flapoù a-stroll"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "N'eus sujed ebet gant ar webgaoz-mañ"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo argaset gant %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s a zo bremañ %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s a zo bremañ %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "N'eus sujed ebet gant ar webgaoz-mañ"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Darempred %(contact_jid)s bet pedet e-barzh %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ne seblant ket bezañ ur JID a-feson"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "N'eus ket eus an urzhiad: /%s (lakait /say araozañ ma fell deoc'h e gas)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Urzhioù: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3889,7 +4273,7 @@ msgstr ""
 "actuellement dans le salon il sera également éjecté. Ne supporte pas les "
 "espaces dans le surnom."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3897,12 +4281,12 @@ msgstr ""
 "Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
 "spécifié."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3911,12 +4295,12 @@ msgstr ""
 "Usage : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la "
 "raison si spécifiée."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3925,7 +4309,7 @@ msgstr ""
 "Usage : /%s <JID> [raison], invite le JID dans le salon actuel, la raison "
 "est optionnelle."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -3934,7 +4318,7 @@ msgstr ""
 "Usage : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur "
 "en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3945,7 +4329,7 @@ msgstr ""
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -3954,7 +4338,7 @@ msgstr ""
 "Usage : /%s <action>, envoie l'action au salon actuel. Utilise la troisième "
 "personne. (ex : /%s explose.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -3963,181 +4347,181 @@ msgstr ""
 "Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et "
 "envoie le message à l'occupant(e) spécifié(e) par le surnom."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Usage : /%s <message>, envoie un message sans chercher d'autres commandes."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "N'eus skoazell hegerz ebet evit /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Ha sur oc'h e fell deoc'h kuitaat ar flap \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Ma serrit ar prenestr-mañ, e tigevreoc'h diouzh ar flap-mañ."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "_Chom hep goulenn ket"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Cheñch ar sujed"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Skrivit ar sujed nevez:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Cheñch lesanv"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Sined lakaet dija"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar sined"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Bez e c'hellit merañ ho sinedoù dre ar meuziad Oberoù er roll-darempredoù."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Ur fazi gouleviñ (programmiñ) ez eus bet kavet"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr ""
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Diskleriañ ar Bug"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Munudoù"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fazi: dibosupl eo digeriñ %s evit e lenn"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, fuzzy, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "N'eus ket bet tu skrivañ e-barzh %s."
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enrollañ ar restr dindan..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Dibosupl eo kavout titourva an istoradur"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Darempredoù"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Deiziad"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Lesanv"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Kemennadenn"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Titl"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4145,7 +4529,7 @@ msgstr ""
 "Ha fellout a ra deoc'h naetaat an titourva? (DIALIET GROÑS M'EMAÑ GAJIM O "
 "VONT EN-DRO)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4154,132 +4538,174 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Oc'h ezporzhiañ an istoradur..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s e lâras %(who)s: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "piv"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Ha sur oc'h e fell deoc'h diverkañ istoradur an darempred-mañ?"
 msgstr[1] "Ha sur oc'h e fell deoc'h diverkañ istoradur an darempredoù-mañ?"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 #, fuzzy
 msgid "This is an irreversible operation."
 msgstr "Setu un ober n'eus ket tu da vont war e giz."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 msgstr[1] "Ha fellout a ra deoc'h da vat diverkañ ar c'hemennadennoù diuzet?"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istoradur flapiñ gant %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s a zo bremañ %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Ar stad a zo bremañ: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Ar stad a zo bremañ: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Kemennadennoù"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Emañ %(nickname)s o paouez lugañ"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Emañ %(nickname)s o paouez dilugañ"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Kemennadenn simpl nevez digant %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Kemennadenn hiniennel nevez digant ar sal %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Dibosupl eo kargañ ar skeudenn"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Resevet ar bedadenn"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "Rankout a rit bezaén luget evit embann ho titouroù hiniennel."
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "C'hwitet eo embannadur ar vCard"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
+"diwezhatoc'h."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Rankout a rit bezañ luget evit kaout titouroù an darempred."
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Sellerien"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Emaoc'h er webgaoz %s dija"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "N'hellit ket ebarzhiñ ur webgaoz keit ha m'emaoc'h diwelus."
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "d'ar gont %s"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "en ur implij ar gont %s"
@@ -4287,41 +4713,53 @@ msgstr "en ur implij ar gont %s"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "en ur implij ar gont %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "eus ar gont %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Merañ ar sinedoù..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "evit ar gont %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Merour an istoradur"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Ebarzhiñ ur webgaoz nevez"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Ebarzhiñ ur sal-flapiñ"
+
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Kemennadennoù nevez ho peus"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4329,68 +4767,87 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Dilamet e vo an nor \"%s\""
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
+"an nor-mañ."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Dibabit un alc'hwezh da"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Sal-flapiñ nevez"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Lugañ"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "_Dilugañ"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Kemmañ an titour-stad"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Kaset eo bet an aotre"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ma asant \"%s\" ar c'houmanant e weloc'h he/e stad."
 
-#: ../src/roster_window.py:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Adalek bremañ e welo ac'hanoc'h \"%s\" atav evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4398,7 +4855,7 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit ivez e/he aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4406,36 +4863,51 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit dre-ziouer he/e aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2334
 msgid "I want this contact to know my status after removal"
 msgstr "Aotreañ an darempred-mañ da welout ma stad war-lerc'h e zilam"
 
-#: ../src/roster_window.py:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"En ur zilemel an darempred-mañ, e tilamit ivez e/he aotre. Atav e welo "
+"ac'hanoc'h evel pa vefec'h ezlinenn."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Ger-kuzh faos"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Kemer a rit perzh e unan pe meur a webgaoz"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4443,164 +4915,131 @@ msgstr ""
 "Tremen d'ar stad diwelus a lakao ac'hanoc'h da zilugañ diouzh ar webkaozioù-"
 "se. Ha sur oc'h e fell deoc'h bezañ diwelus?"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/roster_window.py:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Kemennadennoù nevez ho peus"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr ""
 "Posubl e vo lenn ar gemennadennoù diwezhatoc'h m'emañ an istoradur war enaou."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Kas %s er strollad %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Strollañ %s ha %s"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Kemmañ an titour-stad..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Kemmañ an titour-stad..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Kuzhat ar meuziad-mañ"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d gemennadenn nevez"
-msgstr[1] "Gajim - kemennadennoù nevez: %d"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d gemennadenn nevez"
-msgstr[1] "Gajim - kemennadennoù nevez: %d"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d gemennadenn simpl nevez"
-msgstr[1] "Gajim - kemennadennoù simpl nevez: %d"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d gemennadenn webgaoz nevez"
-msgstr[1] "Gajim - kemennadennoù webgaoz nevez: %d"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d gemennadenn brevez nevez"
-msgstr[1] "Gajim - kemennadennoù prevez nevez: %d"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Perzh:"
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr ""
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Stad:"
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Koumanant:"
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Stad:"
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Stad diwezhañ: %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Dibaoe %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "dibaoe %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "ID Jabber:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Pellgargañ"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Kas"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Doare:"
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Treuzkaset:"
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "N'eo ket kroget"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Arsavet"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Echu"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "O treuzkas"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "N'eus ket bet kaset titouroù munut gant ar servij-mañ c'hoazh"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4608,32 +5047,31 @@ msgstr ""
 "N'eus ket bet kaset titouroù munut gant ar servij-mañ.\n"
 "Sur 'walc'h eo torr pe kamm"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Dibosupl eo kargañ ar skeudenn"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "dibaoe %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+msgid "Affiliation:"
+msgstr ""
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 "Dedennet eo an darempred-mañ gant ho pezañs, met n'oc'h ket gant he/e hini"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4641,39 +5079,27 @@ msgstr ""
 "Dedennet oc'h gant bezañs an darempred-mañ, met hennezh/hounnez n'eo ket "
 "gant ho hini"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Dedennet hoc'h an eil gant bezañs egile/eben"
 
 #. None
-#: ../src/vcard.py:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "N'oc'h ket dedennet gant bezañs an darempred-mañ, nag eñ/hi gant ho hini"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Emaoc'h o c'hortoz respont an darempred d'ho koulenn koumanantiñ"
 
-#: ../src/vcard.py:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr ""
 
-#: ../src/vcard.py:458
-msgid "Without a connection you can not publish your contact information."
-msgstr "Rankout a rit bezaén luget evit embann ho titouroù hiniennel."
-
-#: ../src/vcard.py:491
-msgid "Without a connection, you can not get your contact information."
-msgstr "Rankout a rit bezañ luget evit kaout titouroù an darempred."
-
-#: ../src/vcard.py:495
-msgid "Personal details"
-msgstr "Titouroù hiniennel"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "o krouiñ titourva an istoradur"
 
@@ -4698,95 +5124,89 @@ msgstr "ur renkell eo %s met rankout a rafe bezañ ur restr"
 msgid "creating %s directory"
 msgstr "a grou ar renkell %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (ou python-pysqlite2) n'eo ket staliet. O kuitaat..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Servij dihegerz: n'eo ket loc'het Gajim, pe lakaet eo bet remote_control war "
-"False"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr ""
-"N'eus ket eus D-Bus war an urzhiataer-mañ, pe mankout a ra ur mollad python"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Dihegerz eo bus an estez.\n"
-"Klaskit o lenn http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 "Implij DBus ha Notification-Daemon evit diskouez ar c'hemennadennoù-kelaouiñ"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel ezvezant."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Ezvezant rak dizoberiant"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel dihegerz."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Dihegerz rak dizoberiant."
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Implij ur re */_ evel arouezioù neuziañ an destenn."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "M'eo gwir, ne vo ket dilamet */_. Neuze e vo *abc* tev ma ne vez ket dilamet "
 "* *."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Ouzhpennañ * hag [n] da ditl ar roll darempredoù?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4794,13 +5214,13 @@ msgstr ""
 "Niver a linennoù da vemoriñ diouzh ar gaozeadenn gent pa vez addigoret un "
 "ivinell pe ur prenestr."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "E-pad pet munutenn e rank linennoù diwezhañ ar gaozeadenn kent bezañ "
 "gwarezet."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4808,11 +5228,11 @@ msgstr ""
 "Kas ar gemennadenn gant Ctrl+Kas ha mont d'al linenn gant Kas (emzalc'h dre-"
 "ziouer ar poellad ICQ Mirabilis)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Niver a linennoù da zerc'hel soñj evit Ctrl+BirLaez"
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4821,22 +5241,22 @@ msgstr ""
 "Pe un url personelaet gant %s ennañ, %s o vezañ ar ger-kuzh pe 'WIKTIONARY' "
 "hag a dalvez implij wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "M'eo diuzet, e vo tu da sturiañ Gajim a-bell en ur implij gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Goulenn a-raok serriñ un ivinell pe ur prenestr."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4844,7 +5264,7 @@ msgstr ""
 "Goulenn atav a-raok serriñ ar webgaozioù dispartiet gant un esaouenn ar roll-"
 "mañ."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4852,100 +5272,114 @@ msgstr ""
 "Chom hep goulenn morse a-raok serriñ ar webgaozioù dispartiet gant un "
 "esaouenn er roll-mañ."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 msgstr ""
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Hervez ar standard IEC, KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 msgstr ""
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr ""
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 msgstr ""
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
+"Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
+"chaque contact dans la fenêtre principale et les salons"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr ""
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 n'aime pas l'information sha quand on rejoint un salon protégé "
 "par un mot de passe. Passer cette option a Faux pour ne plus envoyer "
 "l'information sha dans les présences des salons"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4953,7 +5387,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "A reolia ar prenestr a vez lakaet ar c'hemennadennoù nevez enni.\n"
 "'always' - An holl gaozioù en hevelep prenestr.\n"
@@ -4961,213 +5395,390 @@ msgstr ""
 "'peracct' - An holl gaozioù en ur prenestr hervez ar gont.\n"
 "'pertype' - Bep a brenestr gant ur stumm flapiñ (webgaoz/flap)."
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "M'eo faos, ne weloc'h ket an avatar er prenestr-flapiñ ken"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "M'eo gwir, klikit war an douchenn Echap evit serriñ un ivinell/prenestr"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "A guzha an nozelennoù er prenestroù-flapiñ"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "A guzha roll ar berzhidi en ur prenestr webgaoz"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "O kousket"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Distro 'benn nebeut"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Distro 'vin a-benn un nebeut munutennoù.."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "O tebriñ"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "O sellout ouzh ur film 'maon."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "O labourat"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "O labourat 'maon."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Pellgomz"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Ouzh ar pellgomz emaon."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Er-maez"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Er-maez emaon o profitañ eus ar vuhez"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Hegerz"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Prest da flapiñ"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Dihegerz"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "Glas"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "Mab-den"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "Glas-mor"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Ger-kuzh faos"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+"L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
+"temps"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "N'eus ket bet kavet al lesanv : %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Un mot de passe est requis pour rejoindre ce salon."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Vous êtes banni de ce salon."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Ce salon n'existe pas."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "La création de salon est réservée aux administrateurs."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Vous n'êtes pas dans la liste des membres."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Le surnom que vous vouliez utiliser est actuellement utilisé ou enregistré "
+"par un autre occupant.\n"
+"Veuillez entrer un autre surnom ci-dessous :"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "nous sommes maintenant inscrits chez %s"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Requête de désinscription de la part de %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "nous ne sommes plus dans la liste de %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"je Jid %s ne respecte pas la norma RFC. Il ne sera pas ajouté a votre liste "
+"de contact. Utiliser un outil de gestion de liste de contact tel que http://"
+"jru.jabberstudio.org/ pour le supprimer"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Evit kenderc'hel da gas ha da resev kemennadennoù, e rankit lugañ en-dro."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Respont direizh"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Luget d'ar servijer %s:%s gant %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Gwiriekait ho lugadenn pe klaskit en-dro diwezhatoc'h"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "N'eo ket bet roet ar ger-kuzh OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Luget e voc'h da %s hep OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "Diwelus"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "Ezlinenn"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "%s on"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5176,303 +5787,562 @@ msgstr ""
 "Titl : %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
+
+# Traduction moins mauvaise mais pas terrible: binding=lier, attacher
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr ""
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2 (ou python-pysqlite2) n'eo ket staliet. O kuitaat..."
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Servij dihegerz: n'eo ket loc'het Gajim, pe lakaet eo bet remote_control war "
+"False"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr ""
+"N'eus ket eus D-Bus war an urzhiataer-mañ, pe mankout a ra ur mollad python"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Dihegerz eo bus an estez.\n"
+"Klaskit o lenn http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Impossible de rejoindre le salon"
+msgid "one"
+msgstr "Hini ebet"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "piv"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Straed:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Porzh:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "restr"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:581
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Darvoud"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Kenderc'hel"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Dilemel"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "Registration information for transport %s has not arrived in time"
+msgid "%0 o'clock"
 msgstr ""
-"L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
-"temps"
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Impossible de rejoindre le salon"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Un mot de passe est requis pour rejoindre ce salon."
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Vous êtes banni de ce salon."
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Ce salon n'existe pas."
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "La création de salon est réservée aux administrateurs."
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Vous n'êtes pas dans la liste des membres."
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
 msgstr ""
-"Le surnom que vous vouliez utiliser est actuellement utilisé ou enregistré "
-"par un autre occupant.\n"
-"Veuillez entrer un autre surnom ci-dessous :"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "nous sommes maintenant inscrits chez %s"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Requête de désinscription de la part de %s"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Emezelañ war %s"
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "nous ne sommes plus dans la liste de %s"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
 msgstr ""
-"je Jid %s ne respecte pas la norma RFC. Il ne sera pas ajouté a votre liste "
-"de contact. Utiliser un outil de gestion de liste de contact tel que http://"
-"jru.jabberstudio.org/ pour le supprimer"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "O labourat"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Hini ebet"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Darvoud"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Arouezenn ziereizh en anv-arveriad-ez"
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Chomlec'h ar servijer dre ret"
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Arouezenn zireizh en anv-ostiz."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr ""
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s Go"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mo"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s Ko"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "D_ihegerz"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Dihegerz"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Prest da flapiñ"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Prest da flapiñ"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Hegerz"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Hegerz"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "O lugañ"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "E_zvezant"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Ezvezant"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Ezlinenn"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Ezlinenn"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "_Diwelus"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "Dianav"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "fazi"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Digant"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "An daou"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Emezelañ"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Kasourien"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Kasour-ez"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Perzhidi"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Perzhiad-ez"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Gweladennerien"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Gweladenner-ez"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Hini ebet"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Perc'hener-ez"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Merour-ez"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Ezel"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "a zo aketus d'ar gaozeadenn"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "a ra un dra bennak all"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "a skriv ur gemennadenn..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "a zo paouezet da skrivañ ar gemennadenn"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "he/en deus serret ar prenestr-flapiñ pe an ivinell"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d gemennadenn nevez"
+msgstr[1] "Gajim - kemennadennoù nevez: %d"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d gemennadenn simpl nevez"
+msgstr[1] "Gajim - kemennadennoù simpl nevez: %d"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d gemennadenn webgaoz nevez"
+msgstr[1] "Gajim - kemennadennoù webgaoz nevez: %d"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d gemennadenn brevez nevez"
+msgstr[1] "Gajim - kemennadennoù prevez nevez: %d"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fazi: dibosupl eo digeriñ %s evit lenn"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "Cyan"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "o krouiñ titourva an istoradur"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "eus ar gont %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Dibosupl eo kargañ ar skeudenn"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Dibosupl eo en em lugañ da \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Sifret eo ar gemennadenn-mañ]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Koumanantiñ"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Chomlec'h"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Ezvezant"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Pellgargañ"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Dihegerz"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Dilemel"
+
+#~ msgid "Contact _Info"
+#~ msgstr "_Titouroù"
+
+#~ msgid "Contact Information"
+#~ msgstr "Titouroù"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Anv sal pe servijer direizh"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Aozadur D-Bus dianav: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "Gant berzh eo bet embannet ar vCard"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Gant berzh eo bet embannet ho titouroù hiniennel."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "O tilec'hiañ an istoradur..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Ebarzhiñ ur webgaoz nevez"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Kuzhat ar meuziad-mañ"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d gemennadenn nevez"
+#~ msgstr[1] "Gajim - kemennadennoù nevez: %d"
+
+#~ msgid "Since %s"
+#~ msgstr "Dibaoe %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Aotren war-eeun an darempred"
 
diff --git a/po/cs.po b/po/cs.po
index cc6a88dcc..ed37365e8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,12 +14,12 @@
 # Petr Mensik <pihhan@seznam.cz>, 2005.
 # Pihhan <pihhan@seznam.cz>, 2005, 2006.
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-05-04 00:14+0200\n"
 "Last-Translator: Pihhan <pihhan@seznam.cz>\n"
 "Language-Team:  <cs@li.org>\n"
@@ -32,15 +32,15 @@ msgstr ""
 "X-Poedit-Country: CZECH REPUBLIC\n"
 "X-Poedit-SourceCharset: iso-8859-2\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber klient"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Gajim Instant Messenger"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
@@ -59,16 +59,23 @@ msgid "_Discover Services..."
 msgstr "_Prohlížet služby"
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Diskuze"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Upravit úč_et..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Otevři Emailový editor"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stav"
 
@@ -122,7 +129,7 @@ msgid "Pass_word:"
 msgstr "He_slo:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Uložit _heslo"
 
@@ -145,7 +152,7 @@ msgid "Your JID:"
 msgstr "Vaše JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Rozšířené"
 
@@ -159,7 +166,7 @@ msgid "_Host:"
 msgstr "_Počítač:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Heslo:"
 
@@ -191,10 +198,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Příslušenství</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Osobní údaje</b>"
 
@@ -211,6 +220,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Automaticky se znovu připojit při ztrátě spojení"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "_Připojit po startu Gajimu"
 
@@ -230,6 +240,7 @@ msgstr ""
 "server ohlásí jeho podporu. Touto volbou bude TLS vypnuto"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Vyberte _klíč..."
 
@@ -246,16 +257,16 @@ msgid "Edit Personal Information..."
 msgstr "Upravit osobní informace..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Obecné"
 
@@ -281,6 +292,7 @@ msgstr ""
 "spojení způsobenou nečinností"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -289,6 +301,7 @@ msgstr ""
 "pro Vás"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -296,6 +309,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim po spuštění se automaticky připojí pomocí tohoto účtu"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -312,18 +326,23 @@ msgstr "Informace o Vás, jak jsou uloženy na serveru"
 msgid "Manage..."
 msgstr "Spravovat..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Žádný"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Osobní údaje"
 
@@ -346,14 +365,18 @@ msgstr ""
 "klient s vyšší prioritou"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Zd_roj: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -367,40 +390,46 @@ msgstr ""
 "'Práce' zároveň. Zdroj, který má nejvyšší prioritu obdrží zprávy. (více "
 "následuje)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Uložit _heslo (nebezpečné)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Uložit _historii pro všechny kontakty"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Odesílat keep-alive pakety"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronizovat stav účtu s globálním stavem"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Použít _SSL (staré)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Použít vlastní jméno počítače/port"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Použij proxy při přenosu souborů"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Jméno: "
 
@@ -410,63 +439,92 @@ msgstr "Účty"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Máte-li 2 nebo více účtů a je zaškrtnuto, Gajim zobrazí všechny kontakty "
 "jako by byly z jednoho účtu"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Spojit účty"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Upravit"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "Odst_ranit"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Účet"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Dovol mu/jí vidět můj stav"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Přidat nový kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Chtěl(a) bych si Vás přidat do mého Seznamu."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Účet"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Skupina:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Přezdívka:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protokol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Žádat autorizaci"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Re_gistrace"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "Uživatel:"
@@ -558,82 +616,63 @@ msgstr "<b>Zvuky</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Adresa"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "Rozšířené"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Editor rozšířeného nastavení"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Stav: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Pryč"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Nerušit"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Download"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Neviditelný"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "příkaz"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Přidávám zvláštní notifikaci pro %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Nedostupný"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Ukecaný"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Přehrávat _zvuky"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -646,74 +685,74 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Skryje tlačítka v okně diskuze"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Open chat window with user"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Zobrazit pouze v _Seznamu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Zobrazit pouze v _Seznamu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Port: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -749,7 +788,7 @@ msgstr "Vstoupit do _Diskuze"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "Přid_at do Seznamu"
 
@@ -770,7 +809,8 @@ msgid "_Open Link in Browser"
 msgstr "_Otevřít v prohlížeči"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Začít rozhovor"
@@ -780,7 +820,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Klikněte pro starší konverzaci s tímto kontaktem"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Odeslat _Soubor"
 
@@ -796,7 +837,8 @@ msgstr "_Zjednodušený pohled    Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historie"
 
@@ -860,7 +902,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Pokračovat"
 
@@ -898,39 +940,34 @@ msgstr ""
 "Titulek"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Aktivní"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Tučné"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Píšu zprávu"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Staly písma:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Úprava témat Gajimu"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Pryč"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Neaktivní"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Latinka"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -939,7 +976,7 @@ msgstr ""
 "z MUC"
 
 # FIXME: I dont really know what this is and where it is
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -947,19 +984,19 @@ msgstr ""
 "MUC Directed\n"
 "Messages"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Pozastaveno"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "_Barva textu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "Písmo textu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Pozadí:"
 
@@ -1079,7 +1116,7 @@ msgid "Accept"
 msgstr "Přijmout"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Odmítnout"
 
@@ -1087,13 +1124,14 @@ msgstr "Odmítnout"
 msgid "Invitation Received"
 msgstr "Přijata pozvánka"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Přezdívka:"
 
@@ -1111,13 +1149,8 @@ msgstr "Nedávno:"
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Vstoupit"
 
@@ -1142,6 +1175,10 @@ msgstr "Spravuj záložky"
 msgid "Print status:"
 msgstr "Čas tisku:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Server:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Titul:"
@@ -1163,7 +1200,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Spravuj profily Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -1179,20 +1217,21 @@ msgstr "Použij autentifikaci"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikni pro vložení smajlíku (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Šifrování"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Akce"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "Ode_slat"
 
@@ -1266,18 +1305,25 @@ msgid "Also known as iChat style"
 msgstr "Známý také jako iChat styl"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Ptej se na stav při:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "_Automaticky pryč po:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Automaticky _nedostupný po:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1289,19 +1335,19 @@ msgstr ""
 "Vždy použít výchozí aplikace z KDE\n"
 "Vlastní"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "Pře_d přezdívkou:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Rozhovor"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "_Upozornění o stavu rozhovoru:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1311,35 +1357,40 @@ msgstr ""
 "rozvahou, protože tato volba zakáže všechny zprávy od kontaktů, které ještě "
 "nemáte v Seznamu"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Text stavu"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "Výchozí _ikony stavů:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Zobrazovat a_vatary kontaktů v Seznamu"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Zobrazovat p_opis stavu kontaktů v Seznamu"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "_Každých 5 minut"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Smajlíky:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Události"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1349,19 +1400,19 @@ msgstr ""
 "vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru "
 "chcete posílat svému protějšku."
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr "Gajim automaticky zobrazí nové události vyzdvihnutím relativního okna"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
 msgstr ""
 "Gajim Vás upozorní o nové zprávě pomocí popupu v pravém dolním rohu obrazovky"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1369,7 +1420,7 @@ msgstr ""
 "Gajim Vás upozorní o nově připojených kontaktech pomocí popupu v pravém "
 "dolním rohu obrazovky"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1377,12 +1428,18 @@ msgstr ""
 "Gajim Vás upozorní o přávě odpojených kontaktech pomocí popupu v pravém "
 "dolním rohu obrazovky"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim pouze změní ikonu kontaktu, který vyvolal novou událost"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1390,7 +1447,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1398,7 +1455,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat popisy stavů kontaktů pod jménem v "
 "okně Seznamu a v diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1406,7 +1463,7 @@ msgstr ""
 "Pokud bude zaškrtnuto, Gajim si bude pamatovat polohy a velikosti Seznamu a "
 "oken rozhovorů po příštím spuštění"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1416,7 +1473,7 @@ msgstr ""
 "z MSN bude mít odpovídající ikonu msn pro stavy připojen, pryč, nerušit, "
 "atd...)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1424,11 +1481,11 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní "
 "animované nebo statické grafické smajlíky"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "Sp_ravovat..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1440,80 +1497,84 @@ msgstr ""
 "Podle účtu\n"
 "Podle typu"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Upozorni mě na kontakty které se: "
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Upozorni při novém _Gmail e-mailu"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "Při každé _zprávě"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "_Okno jednoduché zprávy:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Přehrávat _zvuky"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Čas tisku:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "Uložit _pozici a velikost pro seznam a okna rozhovorů"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Zobrazit pouze v _Seznamu"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_Přihlásí"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_Odhlásí"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "_Téma:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Text stavu automaticky pryč"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Text stavu nedostupný"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Používej ikony _transportů"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Ikona v systrayi (jinak řečeno v oznamovací oblasti)"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1525,151 +1586,160 @@ msgstr ""
 "nové zprávy nastane pouze tehdy, pokud je od kontaktu, se kterým už "
 "nehovoříte"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Když je přijata nová zpráva"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Editor rozšířeného nastavení"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "_Po čase:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "Pře_d časem:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "_Správce souborů:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Písmo:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "Zvýrazňovat _slova s překlepy"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "_Příchozí zpráva:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "E-_mailový klient:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Upozornit mě"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Otevřít..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "_Odchozí zpráva:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Přehrávač:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "Zobrazit o_kno se zprávou"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "_Vrátit k výchozím barvám"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "_Seřadit podle stavu"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "_Stav:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minutách"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Soukromé rozhovory"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Formát řádky</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "_Připojit po startu Gajimu"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Smazat"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Ban List"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Autorizace"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "Ve skupině"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1677,32 +1747,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Odeslat zprávu"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Požádat o zobrazení je(jí)ho stavu"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Dovol mu/jí vidět můj stav"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "O aplikaci"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adresa"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Nastavit _Avatara"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Den narození:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Obec:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Společnost:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Země:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Oddělení:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Další adresa:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Rodina:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Formát: RRRR-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Křestní:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Dom. stránka:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Střední:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Více"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Osobní údaje"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefon:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Pozice:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "PSČ:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Titul:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Postavení:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Stát:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Ulice:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Za jménem:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Práce"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Zveřejnit"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Získat"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1722,47 +1932,58 @@ msgid "A_sk to see his/her status"
 msgstr "Požádat o zobrazení je(jí)ho stavu"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Přidat zvláštní _upozornění"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Přiřadit Open_PGP klíč"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Odeslat jednoduchou _zprávu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Začít _rozhovor"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Dovol mu/jí vidět můj stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Zakaž mu/jí vidět můj stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "Odst_ranit ze Seznamu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Autorizace"
 
@@ -1787,43 +2008,54 @@ msgid "Help online"
 msgstr "Nápověda online"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Profil, Avatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transporty"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Zobrazit _odpojené kontakty"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Obsah"
 
 # FIXME: chtelo by to cesky vyraz pro service discovery
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Prohlížet služby"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Úpravy"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Nastavení"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Konec"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Hlas"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Jdi"
@@ -1893,23 +2125,19 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorizovat kontakt, aby věděl kdy jste připojen(a)"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "_Informace o kontaktu"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Odmítne autorizaci od kontaktu, takže nebude vidět kdy jste připojen(a)"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Žádost o autorizaci"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Autorizuj"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "O_dmítnout"
 
@@ -1925,164 +2153,51 @@ msgstr "Zobrazit _Seznam"
 msgid "Sta_tus"
 msgstr "S_tav"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "O aplikaci"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adresa"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Žádá:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Den narození:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Obec:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Společnost:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Informace o kontaktu"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Země:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Oddělení:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Další adresa:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Rodina:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Formát: RRRR-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Křestní:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Dom. stránka:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakty"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Poloha"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Střední:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Více"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Telefon:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Pozice:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "PSČ:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Titul:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Postavení:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Nastavit _Avatara"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Stát:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Ulice:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Autorizace:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Za jménem:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Práce"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Zaznamenat historii konverzace"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Zveřejnit"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Získat"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Provoz Jabberu</b>"
@@ -2114,30 +2229,165 @@ msgstr "_Zpráva"
 msgid "_Presence"
 msgstr "_Status"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Jméno:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Jméno:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Osobní údaje"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "Upravit úč_et..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Použít vlastní jméno počítače/port"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Název volby"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Žádný)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Skrýté"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Obecné"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "zelený"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Poloha"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Latinka"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Zveřejnit"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2153,275 +2403,330 @@ msgstr ""
 "\n"
 "Vlastnost zvýrazňování překlepů nebude použita"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Va¹e zpráva nemù¾e být odeslána dokud se nepøipojíte."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Rozhovory"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s: %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s nerozesílá svůj OpenPGP klíč nebo nemá žádný přiřazen"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Šifrování zapnuto"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Šifrování vypnuto"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "není v seznamu"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Právě jsi obdržela novou zprávu od \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "Pokud zavřete toto okno a historie je vypnutá, tato zpráva bude ztracena."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minut"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Aktivní"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Spojení není dostupné"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "text stavu"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "První zpráva přijata"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Další zpráva přijata"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP není použitelné na tomto počítači"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Nepřečtené zprávy"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr "Před změnou jména účtu si musíte přečíst všechny čekající zprávy."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Toto jméno je už použito pro jiný účet. Zvolte jiné, prosím."
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí být ve tvaru \"uživatel@jménoserveru\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Připojit se teď znovu?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Pokud chcete, aby se změny projevily ihned, musíte se znovu přihlásit."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 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:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "Musíte vytvořit účet před úpravou vašich osobních údajů."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Nastala chyba při získávání Vašich OpenPGP privátních klíčů."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Výběr OpenPGP klíče"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Přečtěte si všechny čekající zprávy, než smažete tento účet."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Nemáte aktivní účet"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Jméno účtu už existuje"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Seznam členů"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Seznam vlastníků"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Seznam správců"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Důvod"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Postavení"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Zakazuji..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2429,37 +2734,37 @@ msgstr ""
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát členem?</b>\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát vlastníkem?</b>\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát správcem?</b>\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2476,89 +2781,90 @@ msgstr ""
 "uživatel@doména),\n"
 "doména/zdroj, nebo adresa obsahující poddoménu."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nová místnost"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Diskuze"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Prosím nezapomeňte vyplnit políčka server a místnost, nebo smažte tuto "
 "záložku."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Musíte zadat uživatelské jméno před nastavením tohoto účtu."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Musíte zadat heslo pro nový účet."
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hesla zadaná v obou políčkách musí být identická."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Dvakrát použité Jabber ID"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Tento účet už je nastaven v Gajimu."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2566,23 +2872,23 @@ msgstr ""
 "Můžete nastavit rozšířené volby účtu po stisknutí tlačítka rozšířené, nebo "
 "později stisknutím v položce menu Účty v nabídce Úpravy hlavního okna."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2590,462 +2896,513 @@ msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno po posledním čtení této "
 "diskuze"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL slovníku chybí \"%s\" a není to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Včera"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "před %i dny"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python bindings chybí na tomto počítači"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Možnosti D-Bus nemohou být použity"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Jméno kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "Ve skupině"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "ID klíče"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Jméno kontaktu"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "Text stavu %s"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Text stavu"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Uložit jako přednastavený stav"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Napište jméno pro tento stav"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Adresa:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Adresa:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Další adresa:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplňte údaje kontaktu, který chcete přidat do účtu %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "Uživatel:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber client"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "DÍKY:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Poslední, nikoliv nejmenší, poděkování patří všem správcům instalačních "
 "balíčků."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr "Petr Menšík <pihhan@seznam.cz>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr ""
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Žádost o autorizaci pro účet %s od %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Už jsi v místnosti %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Neplatná místnost nebo jméno serveru"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Neplatné Jabber ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Místnost nebo jméno serveru obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "Vyplňte ID kontaktu se kterým chcete začít rozhovor:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím ujistěte se že jste připojen s účtem \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Nová zpráva"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Kontakt se odhlásil"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
+msgstr "Jednoduchá zpráva z účtu %s"
+
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "XML Konzole"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Popis: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formát řádky</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formát řádky</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Soukromé rozhovory"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s Vás pozval(a) do místnosti %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Spojení"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Ostatní"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Diskuze"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3053,47 +3410,52 @@ msgstr ""
 "Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a "
 "opakujte znovu."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žádné položky, které je možné prohlížet."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Procházím %s pomocí účtu %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Prohlížet"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Tato služba neobsahuje žádné položky, které je možno prohlížet."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
 # FIXME: tohle je blbe prelozene, najit v kontextu a vymyslet lepsi oznaceni
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skenuji %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Uživatelé"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Popis"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Soubor"
@@ -3111,7 +3473,7 @@ msgstr "Průběh"
 msgid "Filename: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Velikost: %s"
@@ -3119,17 +3481,17 @@ msgstr "Velikost: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Příjemce: "
 
@@ -3150,78 +3512,88 @@ msgstr "Přenos souboru zrušen"
 msgid "Connection with peer cannot be established."
 msgstr "Spojení s protistranou se nepodařilo navázat."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Příjemce: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Chyba při čtení souboru:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Přenos souboru byl ukončen protistranou"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Vyber soubor k odeslání..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemůže otevřít tento soubor"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Tento soubor je používán jiným procesem."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Vám chce poslat soubor:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Co by jste rád(a) dělal(a)?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Uložit jako..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3229,58 +3601,262 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Neplatný soubor"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Soubor: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Odesílatel: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim vyžaduje X server k běhu. Končím..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim vyžaduje PyGTK 2.6 nebo novější"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim vyžaduje PyGTK 2.6 nebo novější. Končím..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim potřebuje GTK 2.6 nebo novější"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim vyžaduje GTK 2.6 nebo novější. Končím..."
+
+# FIXME: runtime je jak?
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ runtime vyžaduje podporu libglade"
+
+# FIXME: runtime?
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední stabilní "
+"verzi z %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Ujistěte se prosím, že GTK+ a PyGTK ve Vašem systému podporují libglade."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim vyžaduje PySQLite2"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim vyžaduje PySQLite2"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autorizace pro %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Chcete přijmout tuto žádost?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Spojení"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Předmět: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "chyba při odesílání %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Autorizace přijata"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" Vám odebral autorizaci"
+
+# FIXME: hrozna veta
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Uvidíte jej nebo ji vždy jako odpojenou."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt s \"%s\" nebyl navázán"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Ověřte spojení nebo zkuste později."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s je nyní %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Vaše heslo je neplatné"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nový E-mail on %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Máte %d nepřečtený E-mail"
+msgstr[1] "Máte nepřečtených E-mailů"
+msgstr[2] "Máte nepřečtené zprávy"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s Vám chce poslat soubor."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Soubor %(filename)s od %(name)s byl úspěsně přijat."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Soubor %(filename)s byl uspěšně odeslán %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Prosím vyplňte údaje pro Váš nový účet</b>"
+
+# 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:1747
+msgid "Could not save your settings and preferences"
+msgstr "Nelze uložit Vaše nastavení"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "Podpora Správce sezení není dostupná (schází gnome.ui modul)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "zobrazí nápovědu pro konkrétní příkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "příkaz"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "zobraz nápovědu k příkazu"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Zobrazí nebo skryje okno Seznamu"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Otevře okno s další nepřečtenou zprávou"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3288,47 +3864,47 @@ msgstr ""
 "Vytiskne všech kontaktů v Seznamu. Každý kontakt se objeví na samostatném "
 "řádku"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "účet"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "zobraz pouze kontakty zadaného účtu"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše seznam registrovaných účtů"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Změní stav účtu nebo účtů"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "zpráva"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "text stavu"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3336,19 +3912,19 @@ msgstr ""
 "změnit stav účtu \"account\". Pokud není uveden, zkuste změnit stav všech "
 "účtů které mají povolenu volbu \"sync with global status\" "
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Zobrazte okno rozhovoru, aby jste mohl(a) poslat zprávu kontaktu"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, se kterým chcete komunikovat"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "pokud uvedeno, kontakt bude vzít ze seznamu kontaktů pro tento účet"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3359,27 +3935,27 @@ msgstr ""
 "volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
 "prostě 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "Tělo zprávy"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "pgp klíč"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "pokud bude uvedeno, zpráva bude zašifrována tímto veřejným klíčem"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3390,127 +3966,142 @@ msgstr ""
 "volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
 "prostě 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Předmět"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Zpráva odeslána"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Získej detailní informace o kontaktu"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Získej detailní informace o účtu"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Jméno účtu"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Pošle soubor kontaktu"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "soubor"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Vypíše všechna nastavení a jejich hodnoty"
 
 # FIXME: opravit, pokud je mozne prekladat i key & value
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastaví hodnotu klíče 'key' na hodnotu 'value'"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "klíč=hodnota"
 
 # FIXME: opet
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klíč' je jméno volby, 'hodnota' je hodnota která se nastavuje"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Smaže položku nastavení"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "klíč"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "jméno volby, která bude smazána"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuální nastavení do souboru .config"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Přidat kontakt do Seznamu"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Přidá nový kontakt do tohoto účtu."
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vrátí aktuální stav (globální, pokud není uveden účet)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "Vrací aktuální stav (globální, pokud není uveden účet)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Vrací počet nepřečtených zpráv"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "XML Konzole"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3519,16 +4110,11 @@ msgstr ""
 "'%s' není ve vašem Seznamu.\n"
 "Prosím uveďte účet, přes který bude odeslána zpráva."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Nemáte aktivní účet"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Neznámá verze D-Bus: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3537,16 +4123,16 @@ msgstr ""
 "Použití: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Parametry:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s nebyl nalezen"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3555,7 +4141,7 @@ msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3564,333 +4150,135 @@ msgstr ""
 "Parametry \"%s\" nebyl uveden. \n"
 "Napište \"%s help %s\" pro více informací"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim vyžaduje X server k běhu. Končím..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim vyžaduje PyGTK 2.6 nebo novější"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim vyžaduje PyGTK 2.6 nebo novější. Končím..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim potřebuje GTK 2.6 nebo novější"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim vyžaduje GTK 2.6 nebo novější. Končím..."
-
-# FIXME: runtime je jak?
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ runtime vyžaduje podporu libglade"
-
-# FIXME: runtime?
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední stabilní "
-"verzi z %s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Ujistěte se prosím, že GTK+ a PyGTK ve Vašem systému podporují libglade."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim vyžaduje PySQLite2"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autorizace pro %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Chcete přijmout tuto žádost?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "chyba při odesílání %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Autorizace přijata"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" Vám odebral autorizaci"
-
-# FIXME: hrozna veta
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Uvidíte jej nebo ji vždy jako odpojenou."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt s \"%s\" nebyl navázán"
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Ověřte spojení nebo zkuste později."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s je nyní %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Vaše heslo je neplatné"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Nový E-mail on %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Máte %d nepřečtený E-mail"
-msgstr[1] "Máte nepřečtených E-mailů"
-msgstr[2] "Máte nepřečtené zprávy"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s Vám chce poslat soubor."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Soubor %(filename)s od %(name)s byl úspěsně přijat."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Soubor %(filename)s byl uspěšně odeslán %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "publikování vizitky bylo úspěšné"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Vaše osobní údaje byly úspěšně publikovány."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "publikování vizitky se nezdařilo"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Nastala chyba při publikování Vašich osobních údajů, zkuste to později znovu."
-
-# 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:1683
-msgid "Could not save your settings and preferences"
-msgstr "Nelze uložit Vaše nastavení"
-
-#: ../src/gajim.py:1903
-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:1932
-msgid "Migrating Logs..."
-msgstr "Převádím historii..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Prosím vyčkejte až bude historie převedena..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Téma"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "jméno tématu"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Nemůžete smazat právě používané téma"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Soukromý rozhovor"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Soukromé rozhovory"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "U¾ nejste v místnosti \"%s\" nebo \"%s\" ode¹el(a)."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Diskuze"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Diskuze"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Změ_nit přezdívku"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Místnost nemá žádné téma"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
 
 # FIXME: preklad pro ban? zabanovani je hnusne
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s byl zakázán od %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s se přejmenoval na %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je nyní %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Přezdívka nenalezena: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Místnost nemá žádné téma"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevypadá jako platné JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Neznámý příkaz: /%s (pokud to chcete odeslat, napište před to /say)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Příkazy: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3902,7 +4290,7 @@ msgstr ""
 "Přezdívka nájemníka může být nahrazena, pokud neobsahuje \"@\". Pokud je JID "
 "právě v místnosti, bude vyhozen. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3910,12 +4298,12 @@ msgstr ""
 "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
 "nájemníkovi."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použití: /%s, smaže zprávy v okně."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3924,12 +4312,12 @@ msgstr ""
 "Použití: /%s [důvod], uzavře toto okno nebo záložku, a vypíše důvod, pokud "
 "byl uveden."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Použití: /%s, skryje tlačítka rozhovoru."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3938,7 +4326,7 @@ msgstr ""
 "Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s uvedeným "
 "důvodem."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -3947,7 +4335,7 @@ msgstr ""
 "Použití: /%s <místnost>@<server>[/přezdívka], nabízí vstup do místnosti "
 "místnost@server, případně s uvedenou přezdívkou."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3957,7 +4345,7 @@ msgstr ""
 "Použití: /%s <přezdívka> [důvod], odstraní nájemníka určeného přezdívkou z "
 "místnosti a případně zobrazí důvod. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -3966,7 +4354,7 @@ msgstr ""
 "Použití: /%s <akce>, pošle akci do aktuální místnosti. Použijte třetí osobu "
 "(například /%s explodoval.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -3975,188 +4363,188 @@ msgstr ""
 "Použití: /%s <přezdívka> [zpráva], otevře okno se soukromou zprávou a odešle "
 "zprávu nájemníkovi určeném přezdívkou."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr ""
 "Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Použití: /%s <zpráva>, odešle zprávu bez hledání jiných příkazů."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žádná další nápověda pro /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Pokud zavřete toto okno, budete odpojen(a) z této místnosti."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "Příště _nezobrazovat"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavena"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Místnost \"%s\" už je ve Vašich záložkách."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Můžete spravovat Vaše záložky přes menu Akce ve vašem Seznamu."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
 
 # FIXME: neni presne
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Byla objevena chyba v programu"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr "Pravděpodobně není fatální, ale přesto by měla být ohlášena vývojářům."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Ohlásit chybu"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Detaily"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Chyba při čtení souboru:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Chyba parsování souboru:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Nemůžu zapsat do %s. Podpora správy sezení nebude fungovat"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Uložit jako..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Nemůžu nalézt databázi s historií"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Kontakty"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Přezdívka"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Zpráva"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Předmět"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Chcete pročistit databázi? (VELICE NEDOPORUČUJEME POKUD GAJIM BĚŽÍ)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4170,133 +4558,174 @@ msgstr ""
 "\n"
 "V případě kliknutí na ANO prosím vyčkejte..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Exportuji záznamy historie..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s v %(time)s řekl(a): %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "kdo"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Vážně chcete smazat všechny záznamy historie vybraného kontaktu?"
 msgstr[1] "Vážně chcete smazat všechny záznamy historie vybraných kontaktů?"
 msgstr[2] ""
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Tato operace je nevratná."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vážně chcete smazat vybranou zprávu?"
 msgstr[1] "Vážně chcete smazat vybrané zprávy?"
 msgstr[2] ""
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historie rozhovorů s %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je nyní %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je nyní %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Zprávy"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je nyní %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se přihlásil"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se odhlásil"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová jednoduché zpráva od %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Nová soukromá zpráva z místnosti %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Nezdařilo se načtení obrázku"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Přijata pozvánka"
+
+#: ../src/profile_window.py:315
+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/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "publikování vizitky se nezdařilo"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Nastala chyba při publikování Vašich osobních údajů, zkuste to později znovu."
+
+#: ../src/profile_window.py:381
+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/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Přihlížející"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Už jsi v místnosti %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
@@ -4304,41 +4733,53 @@ msgstr "pomocí účtu %s"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Spravovat záložky..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Vstoupit do nové místnosti"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Připojit se do diskuze"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Máte nepřečtené zprávy"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Přečtěte si všechny čekající zprávy, než smažete tento účet."
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4346,68 +4787,87 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Transport \"%s\" bude smazán"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
+"transportu."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Nová místnost"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Rád bych si Vás přidal(a) do svého seznamu"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Přejme_novat"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "Přih_lásit"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "_Odhlásit"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš status."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, 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:1822
+#: ../src/roster_window.py:2325
 #, 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:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4415,7 +4875,7 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4423,36 +4883,51 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Kontakt \"%s\" bude smazán z Vašeho rosteru"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
+"odpojeného."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Zadej heslo GPG klíče pro účet %s."
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Uložit heslo"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 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:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4460,20 +4935,21 @@ 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:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 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:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Máte nepřečtené zprávy"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4481,151 +4957,112 @@ msgstr ""
 "Zprávy bude možné číst později pouze v případě, budete-li mít povolenou "
 "historii."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Smazat %s ve skupině %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, 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:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Změnit popis stavu..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Skryje toto menu"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d nepřečtenou zprávu"
-msgstr[1] "Gajim - %d nepřečtené zprávy"
-msgstr[2] "Gajim - %d nepřečtených zpráv"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d nepřečtenou zprávu"
-msgstr[1] "Gajim - %d nepřečtené zprávy"
-msgstr[2] "Gajim - %d nepřečtených zpráv"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d nepřečtenou prosté zprávu"
-msgstr[1] "Gajim - %d nepřečtené prosté zprávy"
-msgstr[2] "Gajim - %d nepřečtených zpráv"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d nepřečtenou zprávu z diskuze"
-msgstr[1] "Gajim - %d nepřečtené zprávy z diskuze"
-msgstr[2] "Gajim - %d nepřečtených zpráv"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d nepřečtenou soukromou zprávu"
-msgstr[1] "Gajim - %d nepřečtené soukromé zprávy"
-msgstr[2] "Gajim - %d nepřečtených zpráv"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Role:"
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Přidružení:"
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Stav: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Autorizace: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Stav: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Poslední stav v %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Od %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "od %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Přeneseno: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Nespuštěno"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Dokončeno"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Stagnuje"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Přenáším"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Tato služba dosud neodpověděla s detaily"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4633,68 +5070,56 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Nezdařilo se načtení obrázku"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Přidružení:"
+
+#: ../src/vcard.py:265
 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:334
+#: ../src/vcard.py:267
 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:336
+#: ../src/vcard.py:269
 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:338
+#: ../src/vcard.py:271
 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:347
+#: ../src/vcard.py:279
 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:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
-#: ../src/vcard.py:458
-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:491
-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:495
-msgid "Personal details"
-msgstr "Osobní údaje"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "vytvářím databázi historie"
 
@@ -4719,91 +5144,87 @@ msgstr "%s je adresář, ale měl by být soubor"
 msgid "creating %s directory"
 msgstr "vytvářím adresář %s "
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-"Závislost na pysqlite2 (neboli python-pysqlite2) není splněna. Končím..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Služba není dostupná. Gajim neběží, nebo remote_control je vypnutý"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus není přítomna na tohto stroji nebo modul pythonu chybí"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Session bus není k dispozici.\n"
-"Zkuste přečíst http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Používej DBus a Notifikačního démona k zobrazování notifikací"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na pryč."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Pryč jako výsledek nečinnosti"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na nedostupný."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Nedostupný jako výsledek nečinnosti"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Ber * / _ páry jako možné formátovací znaky."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Pokud zapnuto, nemažte */_ . Potom *abc* bude tučně ale s * * neodstraněnými."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Přidat * a [n] k titulku Seznamu?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4811,11 +5232,11 @@ msgstr ""
 "Jak moc řádků si pamatovat z předchozího rozhovoru, když je okno/záložka "
 "rozhovoru znovu otevřena."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kolik minut by měly řádky z předchozího rozhovoru zůstat."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4823,11 +5244,11 @@ msgstr ""
 "Odeslat zprávu při Ctrl+Enter a při Enter přejít na nový řádek (výchozí "
 "chování klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kolik řádků uložit pro Ctrl+Šipka nahoru."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4836,21 +5257,21 @@ msgstr ""
 "Buď vlastní url s %s v těle, kde %s je slovo nebo fráze, nebo 'WIKTIONARY', "
 "která znamená že se použije wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Pokud zaškrtnuta, Gajim může být ovládán vzdáleně pomocí gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ptát se před zavřením oken/záložek diskuzí."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4858,7 +5279,7 @@ msgstr ""
 "Ptát se před zavřením oken/záložek diskuzí uvedených v tomto mezerami "
 "oddělením seznamu místností."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4866,7 +5287,7 @@ msgstr ""
 "Nikdy se neptát před zavřením oken/záložek diskuzí uvedených v tomto "
 "mezerami oddělením seznamu místností."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4874,30 +5295,30 @@ msgstr ""
 "Nahradí počítač ze kterého odesíláte v případě překladu adres nebo "
 "přesměrování portu."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard říká KiB = 1024 bytů, KB = 1000 bytů."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Zobrazit záložku při jediném rozhovoru?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Zobrazit okraj záložky při jediném rozhovoru?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr "Středníkem oddělený seznam slov, které budou zvýrazněny v diskuzích."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4905,13 +5326,13 @@ msgstr ""
 "Pokud zapnuto, ukonči Gajim když bude stisknuto tlačítko X v titulku okna. "
 "Toto nastavení se použije pouze tehdy, pokud je použita ikona v trayi."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr ""
 "Pokud zapnuto, Gajim se zaregistruje jako obsluha xmpp:// při každém "
 "spuštění."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4919,15 +5340,16 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené "
 "zprávy. V závislosti na tématu, tato ikona může být animovaná."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Pokud zapnuto, Gajim zobrazí popis stavu, pokud není prázdný, pro každý "
 "kontakt pod jménem v okně Seznamu"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4935,7 +5357,7 @@ msgstr ""
 "pokud zapnuto, Gajim se zeptá na avatara každého kontaktu který neměl "
 "naposledy avatara nebo kterého uložený je příliš starý."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4944,20 +5366,29 @@ msgstr ""
 "Pokud vypnuto, nebudete vidět řádku se stavem v rozhovorech, když kontakt "
 "změní svůj stav."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4967,17 +5398,19 @@ msgstr ""
 "oknem (výchozí chování ve většině Window Managerů) pokud čekají nové "
 "události."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 nemá rád sha informaci, pokud někdo vstupuje do místnosti "
 "chráněné heslem. Zaškrtněte tuto volbu na False, aby se sha informace "
 "neposílala v presenci u diskuzí"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4985,7 +5418,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Řídí okno, kam budou doručeny nové zprávy.\n"
 "'vždy' - Všechny zprávy jsou odeslány do jediného okna.\n"
@@ -4995,52 +5428,67 @@ msgstr ""
 "zvláštního okna. Vězte, že změna této volby vyžaduje restartování Gajimu, "
 "aby se projevila"
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Pokud je False, nebudete nadále vidět avatary v okně rozhovoru"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Pokud je True, stiskem escape zavřete záložku nebo okno"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Skryje tlačítka v okně diskuze"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Skryje tlačítka v okně rozhovoru dvou lidí"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Skryje nadpis v okně diskuze"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Skryje nadpis v okně rozhovoru dvou lidí"
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "Skryje seznam lidí místnosti v okně diskuze"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5048,59 +5496,106 @@ msgstr ""
 "Pokud je zaškrtnuto, Gajim použije Vaší IP a proxy servery definované ve "
 "volbě pro přenos souborů file_transfer_proxies."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP není použitelné na tomto počítači"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Užívám si života venku"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Připojen"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Ukecaný"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Nedostupný"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5108,7 +5603,7 @@ msgstr ""
 "Zvuk, který bude přehrán, pokud zpráva diskuze obsahuje jedno ze slov v "
 "muc_highlight_words, nebo když obsahuje Vaši přezdívku."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5116,97 +5611,205 @@ msgstr ""
 "Zvuk, který bude přehrán při každé příchozí zprávě diskuze. (Tato volba se "
 "bere v úvahu pouze tehdy, je-li zapnuto notify_on_all_muc_messages)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "mariňák"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Nesprávné heslo"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Přezdívka nenalezena: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1515
+#, fuzzy
+msgid "You are banned from this room."
+msgstr "Už jsi v místnosti %s"
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1527
+#, fuzzy
+msgid "You are not in the members list."
+msgstr "Nejste připojen(a) k serveru"
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Rád(a) bych si tě přidal(a) do seznamu."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy, python-format
+msgid "unsubscribe request from %s"
+msgstr "Žádost o autorizaci od %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Pro pokračování v přijímání a odesílání zpráv se musíte znovu připojit."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Transport %s odpověděl chybně na požadavek registrace."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Neplatná odpověď"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Připojen k server %s: %s s %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP heslo nebylo zadáno"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete připojen(a) k %s bez OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "neviditelný"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "odpojen"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Jsem %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Tato zpráva je zašifrovaná]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5215,296 +5818,564 @@ msgstr ""
 "Předmět: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Rád(a) bych si tě přidal(a) do seznamu."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
-msgid "Unable to load idle module"
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python bindings chybí na tomto počítači"
+
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Možnosti D-Bus nemohou být použity"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
+"Závislost na pysqlite2 (neboli python-pysqlite2) není splněna. Končím..."
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr "Služba není dostupná. Gajim neběží, nebo remote_control je vypnutý"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus není přítomna na tohto stroji nebo modul pythonu chybí"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
 msgstr ""
+"Session bus není k dispozici.\n"
+"Zkuste přečíst http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/connection_handlers.py:581
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Žádný"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "kdo"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Ulice:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Port: "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "soubor"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Událost"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Pokračovat"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Smazat"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "Registration information for transport %s has not arrived in time"
+msgid "%0 o'clock"
 msgstr ""
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1454
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 #, fuzzy
-msgid "You are banned from this room."
-msgstr "Už jsi v místnosti %s"
+msgid "ten to %1"
+msgstr "Registrovat k %s"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
+#: ../src/common/fuzzyclock.py:62
 #, fuzzy
-msgid "You are not in the members list."
-msgstr "Nejste připojen(a) k serveru"
+msgid "Morning"
+msgstr "Pracuji"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
 msgstr ""
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Žádný"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1521
-#, fuzzy, python-format
-msgid "unsubscribe request from %s"
-msgstr "Žádost o autorizaci od %s"
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Událost"
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
 msgstr ""
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Neplatný znak v uživatelském jméně."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Je potřeba adresa serveru."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Neplatný znak v hostname."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Nerušit"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Nedostupný"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "Přip_ojen"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Připojen"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "_Pryč"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Pryč"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Příjemce"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Odesílatel"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Obojí"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Žádná"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Role:Žádná"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Vlastník"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Správce"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "Č_len"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "píše zprávu..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d nepřečtenou zprávu"
+msgstr[1] "Gajim - %d nepřečtené zprávy"
+msgstr[2] "Gajim - %d nepřečtených zpráv"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d nepřečtenou prosté zprávu"
+msgstr[1] "Gajim - %d nepřečtené prosté zprávy"
+msgstr[2] "Gajim - %d nepřečtených zpráv"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d nepřečtenou zprávu z diskuze"
+msgstr[1] "Gajim - %d nepřečtené zprávy z diskuze"
+msgstr[2] "Gajim - %d nepřečtených zpráv"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d nepřečtenou soukromou zprávu"
+msgstr[1] "Gajim - %d nepřečtené soukromé zprávy"
+msgstr[2] "Gajim - %d nepřečtených zpráv"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "azurová"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "vytvářím databázi historie"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "účtu %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Nezdařilo se načtení obrázku"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Nemůžu se připojit k \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Tato zpráva je zašifrovaná]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Žádat autorizaci"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Adresa"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Pryč"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Download"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Přidávám zvláštní notifikaci pro %s"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Nedostupný"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Smazat"
+
+#~ msgid "Contact _Info"
+#~ msgstr "_Informace o kontaktu"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informace o kontaktu"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Neplatná místnost nebo jméno serveru"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Neznámá verze D-Bus: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ 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."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Převádím historii..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Prosím vyčkejte až bude historie převedena..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Vstoupit do nové místnosti"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Skryje toto menu"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d nepřečtenou zprávu"
+#~ msgstr[1] "Gajim - %d nepřečtené zprávy"
+#~ msgstr[2] "Gajim - %d nepřečtených zpráv"
+
+#~ msgid "Since %s"
+#~ msgstr "Od %s"
+
 #~ msgid "Would you like to overwrite it?"
 #~ msgstr "Chcete jej přepsat?"
 
diff --git a/po/de.po b/po/de.po
index 226bdd27e..b5f9f474c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,29 +3,29 @@
 # This file is distributed under the same license as the gajim package.
 # Fridtjof Busse <fridtjof@fbunet.de>, 2005, 2006.
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-04 14:11+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-09-06 19:57+0200\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "Ein GTK+ Jabber-Client"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Gajim Instant Messenger"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM-Client"
 
@@ -42,16 +42,23 @@ msgid "_Discover Services..."
 msgstr "_Durchsuche Dienste..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Gruppenchat"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Konto bearbeiten"
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "Email-Programm _öffnen"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
 
@@ -106,7 +113,7 @@ msgid "Pass_word:"
 msgstr "Pass_wort:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Pass_wort speichern"
 
@@ -131,7 +138,7 @@ msgid "Your JID:"
 msgstr "Ihre JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Erweitert"
 
@@ -145,7 +152,7 @@ msgid "_Host:"
 msgstr "_Server:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Passwort:"
 
@@ -177,10 +184,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Verschiedenes</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persönliche Informationen</b>"
 
@@ -197,6 +206,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Automatisch neu verbinden, wenn die Verbindung abbricht"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Beim Pr_ogrammstart verbinden"
 
@@ -217,6 +227,7 @@ msgstr ""
 "und sie TLS mit dieser Option deaktivieren"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "_Schlüssel wählen..."
 
@@ -233,14 +244,16 @@ msgid "Edit Personal Information..."
 msgstr "Persönliche _Details bearbeiten..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:406
-#: ../src/notify.py:428 ../src/notify.py:440 ../src/tooltips.py:330
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46 ../src/roster_window.py:300
-#: ../src/roster_window.py:1256 ../src/roster_window.py:1640
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Allgemein"
 
@@ -265,22 +278,25 @@ msgstr ""
 "Verbindungsabbruch durch eine Zeitüberschreitung zu verhindern"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
 msgstr ""
-"Wenn aktiviert, wird Gajim das Passwort in ~/.gajim/config mit "
-"Lese-Rechten nur für Sie speichern"
+"Wenn aktiviert, wird Gajim das Passwort in ~/.gajim/config mit Lese-Rechten "
+"nur für Sie speichern"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr ""
-"Wenn aktiviert, wird Gajim während des Startvorgangs "
-"automatisch zu diesem Konto verbinden"
+"Wenn aktiviert, wird Gajim während des Startvorgangs automatisch zu diesem "
+"Konto verbinden"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -298,18 +314,23 @@ msgstr "Informationen über Sie, wie sie auf dem Server gespeichert sind"
 msgid "Manage..."
 msgstr "Verwalten ..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1511
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Kein Schlüssel gewählt"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1112
-#: ../src/config.py:1117 ../src/config.py:1289 ../src/config.py:1569
-#: ../src/config.py:1642 ../src/config.py:2351
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Kein"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Persönliche Informationen"
 
@@ -333,14 +354,18 @@ msgstr ""
 "die Ereignisse"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Ressour_ce: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -355,39 +380,46 @@ msgstr ""
 "verbinden. Die Ressource mit der höchsten Priorität wird die Nachrichten "
 "erhalten (siehe unten)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "_Passphrase speichern (unsicher)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Unter_haltungsverlauf für alle Kontakte dieses Kontos speichern"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Sende keep-alive Pakete"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Konto-Status mit globalem Status abgleichen"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "_SSL verwenden (veraltet)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Verwende benutzerdefinierten Hostname und Port"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Verwende Datentransfer-Proxies"
 
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Name: "
 
@@ -397,21 +429,35 @@ msgstr "Konten"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Wenn Sie zwei oder mehr Konten haben und diese Option gewählt ist, wird "
 "Gajim alle Kontakte auflisten, als hätten Sie ein Konto"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "Konten _zusammenführen"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Ändern"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Entfernen"
@@ -569,7 +615,7 @@ msgid "All Status "
 msgstr "Alle Status "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "Away"
 msgstr "Abwesend"
 
@@ -586,7 +632,7 @@ msgid "Have "
 msgstr "habe "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -595,7 +641,7 @@ msgid "Launch a command"
 msgstr "Starte ein Kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
@@ -751,7 +797,8 @@ msgid "_Open Link in Browser"
 msgstr "Link _öffnen"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "Chat starten"
@@ -762,6 +809,7 @@ msgstr "Klicken, um die früheren Unterhaltungen mit diesem Kontakt zu sehen"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
 #: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "_Datei Senden"
 
@@ -778,6 +826,7 @@ msgstr "_Kompakte Ansicht Alt+C"
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
 #: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Verlauf"
 
@@ -846,7 +895,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Zeige eine Benachrichtigung, wenn die Datei komplett übertragen wurde."
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:752
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
@@ -882,39 +931,35 @@ msgstr ""
 "Kontakt\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/config.py:327
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/glade/gajim_themes_window.glade.h:6
 msgid "Bold"
 msgstr "Fett"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Erstellen"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Schriftart:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Gajim Thema Einstellungen"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Weg"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -922,7 +967,7 @@ msgstr ""
 "MUC\n"
 "Nachrichten"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -930,19 +975,19 @@ msgstr ""
 "MUC gerichtete\n"
 "Nachrichten"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:649
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Unterbrochen"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "Text_farbe:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "Schrift_art:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Hintergrund:"
 
@@ -1062,7 +1107,7 @@ msgid "Accept"
 msgstr "Akzeptieren"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Ablehnen"
 
@@ -1070,13 +1115,14 @@ msgstr "Ablehnen"
 msgid "Invitation Received"
 msgstr "Einladung empfangen"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1067
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Betrete Chatraum"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Spitzname:"
 
@@ -1094,13 +1140,8 @@ msgstr "Kürzlich:"
 msgid "Room:"
 msgstr "Raum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1510
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Betreten"
 
@@ -1124,6 +1165,10 @@ msgstr "Verwalte Bookmarks"
 msgid "Print status:"
 msgstr "Status anzeigen:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Server:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Titel:"
@@ -1145,7 +1190,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Proxy Verwaltung"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Name:"
 
@@ -1161,20 +1207,21 @@ msgstr "Verwende Authentifizierung"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klicken Sie, um ein Emoticon einzufügen (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1066
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP-Verschlüsselung"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Aktionen"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Senden"
 
@@ -1282,7 +1329,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Vor d_em Spitznamen:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:806
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Chat"
 
@@ -1415,7 +1462,10 @@ msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
 "etc...)"
-msgstr "Wenn Sie diese Option aktivieren wird Gajim Protokoll-spezifische Symbole verwenden (Ein Kontakt aus MSN wird z.B. das äquivalente MSN-Symbol für den Status \"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc. haben)"
+msgstr ""
+"Wenn Sie diese Option aktivieren wird Gajim Protokoll-spezifische Symbole "
+"verwenden (Ein Kontakt aus MSN wird z.B. das äquivalente MSN-Symbol für den "
+"Status \"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc. haben)"
 
 #: ../data/glade/preferences_window.glade.h:52
 msgid ""
@@ -1474,46 +1524,50 @@ msgid "Save _position and size for roster and chat windows"
 msgstr "Speichere _Position und Größe der Kontaktliste und Chatfenster"
 
 #: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Nur in der _Kontaktliste anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_anmelden"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "a_bmelden"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "T_hema:"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Automatische Statusnachricht für Abwesend"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Automatische Statusnachricht für Nicht verfügbar"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "_Transport-Symbole verwenden"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr "Benutze System-_Voreinstellung"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Verwende _Trayicon (Benachrichtigungs-Icon)"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1526,155 +1580,152 @@ msgstr ""
 "wenn Sie eine Nachricht von einem Kontakt erhalten, mit dem Sie nicht "
 "bereits chatten"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Wenn neue Nachricht empfangen wird"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:79
 msgid "_Advanced Notifications Control..."
 msgstr "_Erweiterter Konfigurations-Editor"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "_Nach der Zeit:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "_Vor der Zeit:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "_Dateimanager:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Schriftart:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Ereignisse von Kontakten, die nicht in der Liste sind, _ignorieren"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "_Eingehende Nachricht:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Logge die Statusveränderungen von Kontakten"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Mail-Programm:"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Nie"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "Be_nachrichtigen"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "Ö_ffnen ..."
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "_Ausgehende Nachricht:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Player:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Öffnen"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "Auf Standard-Farben zu_rücksetzen"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "Kontakte nach Status _sortieren"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "_Statusnachricht:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../data/glade/preferences_window.glade.h:100
-msgid "Επιλογή μιας γραμματοσειράς"
-msgstr ""
-
-#: ../data/glade/preferences_window.glade.h:101
-msgid "Επιλογή χρώματος"
-msgstr ""
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Privatlist"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Hinzufügen / Ändern einer Regel</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Liste aller Regeln</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:4
+#: ../data/glade/privacy_list_window.glade.h:4
 msgid "Active for this session"
 msgstr "Aktiviert für diese Sitzung"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5
+#: ../data/glade/privacy_list_window.glade.h:5
 msgid "Active on each startup"
 msgstr "Bei jedem Programmstart aktiv"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6 ../src/config.py:2350
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr "Alle"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr "Erlauben"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "Jabber-ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1761
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 msgid "Privacy List"
 msgstr "Privatliste"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 msgid "all by subscription"
 msgstr "alle nach Anmeldung"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all in the group"
 msgstr "Alle in der Gruppe"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1686,29 +1737,168 @@ msgstr ""
 "von\n"
 "an"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 msgid "to send me messages"
 msgstr "um mir Nachrichten zu senden"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me status"
 msgstr "um mir den Status zu senden"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to view my status"
 msgstr "um meinen Status zu sehen"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr "Erstelle eigene Privatliste"
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Über"
+
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adresse"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "_Avatar wählen"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Geburtstag:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Stadt:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Firma:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Land:"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr "Server-basierte Privatliste"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Abteilung:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Zusatz-Adresse:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Nachname:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: JJJJ-MM-TT"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Vorname:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Mittelname"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Mehr"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "Personal Info"
+msgstr "Persönliche Details"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefon-Nr.:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Position:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Postleitzahl:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Präfix"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Rolle:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Staat:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Straße:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Suffix:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Arbeit"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Veröffentlichen"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "Ab_rufen"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1727,20 +1917,23 @@ msgid "A_sk to see his/her status"
 msgstr "Darum bitten, seinen/ihren _Status zu sehen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Spezielle Be_nachrichtigung hinzufügen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Open_PGP-Schlüssel zuweisen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../src/roster_window.py:1619
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1577
+#: ../src/roster_window.py:1732
 msgid "In_vite to"
 msgstr "Einladen zu"
 
@@ -1750,6 +1943,7 @@ msgid "Send Single _Message"
 msgstr "Einzelne Nachricht Senden"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "_Chat starten"
 
@@ -1762,12 +1956,13 @@ msgid "_Forbid him/her to see my status"
 msgstr "_Verbiete ihm/ihr, meinen Status zu sehen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1571 ../src/roster_window.py:1717
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "Entfernen von _Kontaktliste"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1705
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Umbenennen"
 
@@ -1796,42 +1991,53 @@ msgid "Help online"
 msgstr "Online-Hilfe"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Profile, Avatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transports"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "_Abgemeldete Kontakte anzeigen"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "In_halte"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Dienste durchsuchen"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1255
-#: ../src/roster_window.py:1697
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Ändern"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Beenden"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Stimme verleihen"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Los"
@@ -1901,24 +2107,20 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Kontakt autorisieren, sodass er sehen kann, wann Sie verbunden sind"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "Kontakt-_Info"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Autorisierung des Kontakts verweigern, sodass er nicht sehen kann, wann Sie "
 "verbunden sind"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Abonnementanfrage"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Autorisieren"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Ablehnen"
 
@@ -1934,154 +2136,50 @@ msgstr "_Roster anzeigen"
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Über"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adresse"
-
 #. Given Name
 #: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Frage:"
 
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Geburtstag:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "City:"
-msgstr "Stadt:"
-
 #: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Client:"
 
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Company:"
-msgstr "Firma:"
-
 #: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Country:"
-msgstr "Land:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "Department:"
-msgstr "Abteilung:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Extra Address:"
-msgstr "Zusatz-Adresse:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Family:"
-msgstr "Nachname:"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Given:"
-msgstr "Vorname:"
-
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Homepage:"
-msgstr "Homepage:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Middle:"
-msgstr "Mittelname"
-
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "More"
-msgstr "Mehr"
-
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "BS:"
 
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "Personal Info"
-msgstr "Persönliche Details"
-
-#: ../data/glade/vcard_information_window.glade.h:28
-msgid "Phone No.:"
-msgstr "Telefon-Nr.:"
-
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "Position:"
-msgstr "Position:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Postal Code:"
-msgstr "Postleitzahl:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Prefix:"
-msgstr "Präfix"
-
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ressource:"
 
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Role:"
-msgstr "Rolle:"
-
-#: ../data/glade/vcard_information_window.glade.h:35
-msgid "State:"
-msgstr "Staat:"
-
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Street:"
-msgstr "Straße:"
-
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Abonnement:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Suffix:"
-msgstr "Suffix:"
-
-#: ../data/glade/vcard_information_window.glade.h:42
-msgid "Work"
-msgstr "Arbeit"
-
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "Unterhaltungs-Ver_lauf"
 
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "_Publish"
-msgstr "_Veröffentlichen"
-
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "_Retrieve"
-msgstr "Ab_rufen"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Verkehrsdaten</b>"
@@ -2113,25 +2211,63 @@ msgstr "_Nachricht"
 msgid "_Presence"
 msgstr "_Anwesenheit"
 
-#: ../src/advanced.py:67
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Name:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Name:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Persönliche Details"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "Konto bearbeiten"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Verwende benutzerdefinierten Hostname und Port"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Einstellungsname"
 
-#: ../src/advanced.py:73
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Wert"
 
-#: ../src/advanced.py:82
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:138
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Kein)"
 
 #. we talk about password
-#: ../src/advanced.py:237
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Versteckt"
 
@@ -2140,96 +2276,95 @@ msgstr "Versteckt"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "English"
 msgstr "Englisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Briton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "German"
 msgstr "Deutsch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Basc"
 msgstr "Baskisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "French"
 msgstr "Französisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Norvegian b"
 msgstr "Norwegisch (Bokmal)"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Norvegian"
 msgstr "Norwegisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Brazilian Portuguese"
 msgstr "Brasilianisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Russian"
 msgstr "Russsich"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovakisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../src/chat_control.py:50
+#: ../src/chat_control.py:52
 msgid "Chinese (Ch)"
 msgstr "Chinesisch"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:194 ../src/dialogs.py:1424
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2245,62 +2380,63 @@ msgstr ""
 "\n"
 "Falschgeschriebene Wörter werden nicht hervorgehoben"
 
-#: ../src/chat_control.py:220
+#: ../src/chat_control.py:239
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:249 ../src/chat_control.py:454
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/chat_control.py:250 ../src/chat_control.py:455
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
 
-#: ../src/chat_control.py:806
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/chat_control.py:994
-#, python-format
-msgid "%s from room %s"
-msgstr ""
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s:·%(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1080
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s hat keinen OpenPGP-Schlüssel verbreitet und es wurde keiner zugewiesen"
 
-#: ../src/chat_control.py:1206
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Verschlüsselung aktiviert"
 
-#: ../src/chat_control.py:1211
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1349 ../src/conversation_textview.py:475
-#: ../src/dialogs.py:604 ../src/gajim.py:657 ../src/gajim.py:658
-#: ../src/gajim.py:983 ../src/roster_window.py:286
-#: ../src/roster_window.py:1446 ../src/roster_window.py:1880
-#: ../src/roster_window.py:2081 ../src/roster_window.py:2092
-#: ../src/roster_window.py:2414 ../src/roster_window.py:2470
-#: ../src/roster_window.py:3275 ../src/roster_window.py:3277
-#: ../src/common/helpers.py:40 ../src/common/helpers.py:242
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "Nicht in der Liste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1492
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\""
 
-#: ../src/chat_control.py:1493
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2308,80 +2444,96 @@ msgstr ""
 "Wenn sie das Fenster schließen und die History abgeschaltet haben, geht die "
 "Nachricht verloren."
 
-#: ../src/config.py:121 ../src/config.py:541
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../src/config.py:200
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Alle %s _Minuten"
 
-#: ../src/config.py:335
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:940
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Keine Verbindung verfügbar"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:940
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "Statusnachricht"
 
-#: ../src/config.py:975
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:976
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Nächste empfangene Nachricht"
 
-#: ../src/config.py:977
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:978
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:979
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:980
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Gruppenchat Nachrichten-Hervorhebung"
 
-#: ../src/config.py:981
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Gruppenchat-Nachricht empfangen"
 
-#: ../src/config.py:1171
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Verbindung muss beendet werden, um Kontonamen zu ändern."
 
-#: ../src/config.py:1217 ../src/config.py:1780
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
 
-#: ../src/config.py:1218
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr "Um Kontonamen zu ändern, müssen Sie alle neunen Ereignisse lesen."
 
-#: ../src/config.py:1222
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Kontoname wird bereits verwendet"
 
-#: ../src/config.py:1223
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2389,157 +2541,177 @@ msgstr ""
 "Dieser Name wird bereits für einen anderen Ihrer Accounts verwendet. Bitte "
 "wählenSie einen anderen Namen."
 
-#: ../src/config.py:1227 ../src/config.py:1231
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1228
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1232
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1240 ../src/config.py:1246 ../src/config.py:1255
-#: ../src/config.py:2731
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber ID"
 
-#: ../src/config.py:1247
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID muss in der Form \"user@servername\" sein."
 
-#: ../src/config.py:1303
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:1304
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Proxy Port muss eine Portnummer sein."
 
-#: ../src/config.py:1424
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/config.py:1434
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Jetzt neu einloggen?"
 
-#: ../src/config.py:1435
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich neu "
 "einloggen."
 
-#: ../src/config.py:1461
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Account nicht verfügbar"
 
-#: ../src/config.py:1462
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Sie müssen ein Konto erstellen bevor Sie die persönlichen Informationen "
 "ändern können"
 
-#: ../src/config.py:1468 ../src/dialogs.py:1051 ../src/dialogs.py:1229
-#: ../src/disco.py:411 ../src/vcard.py:478 ../src/vcard.py:511
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
 
-#: ../src/config.py:1469
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Sie müssen angemeldet sein, um Ihre persönlichen Informationen zu bearbeiten"
 
-#: ../src/config.py:1473
+#: ../src/config.py:1545
 msgid "Your server doesn't support Vcard"
 msgstr "Ihr Server unterstützt vCard nicht"
 
-#: ../src/config.py:1474
+#: ../src/config.py:1546
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:1498
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
 
-#: ../src/config.py:1499
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Es gab ein Problem beim Holen ihres geheimen OpenPGP-Schlüssels."
 
-#: ../src/config.py:1502
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Schlüssel-Auswahl"
 
-#: ../src/config.py:1503
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP Schlüssel"
 
 #. Name column
-#: ../src/config.py:1732 ../src/disco.py:727 ../src/disco.py:1469
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1735
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1781
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse lesen, bevor der Account entfernt wird."
 
-#: ../src/config.py:1978
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Kein aktives Konto"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Kontoname wird bereits verwendet"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "%s ändern"
 
-#: ../src/config.py:1980
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
-#: ../src/config.py:2051
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2052
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Mitgliedsliste"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Listenbesitzer"
 
-#: ../src/config.py:2054
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2087 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2095
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2100
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2104
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2125
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Verbanne ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2127
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2547,11 +2719,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2129
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Füge Mitglied hinzu ..."
 
-#: ../src/config.py:2130
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2559,11 +2731,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2132
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Füge Besitzer hinzu ..."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2571,11 +2743,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2135
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Füge Administrator hinzu ..."
 
-#: ../src/config.py:2136
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2583,7 +2755,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2137
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2598,88 +2770,89 @@ msgstr ""
 "3 domain (die Domain selbst trifft zu, als auch jeder benutzer@domain,\n"
 "jede domain/resource oder Adresse, die eine Subdomain enthält."
 
-#: ../src/config.py:2234
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2251 ../src/roster_window.py:2145
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2252 ../src/roster_window.py:2146
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geben Sie ihr Passwort für %s ein"
 
-#: ../src/config.py:2253 ../src/roster_window.py:2147
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2266
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" ist mit Server verbunden"
 
-#: ../src/config.py:2267
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2351
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:2421
-msgid "New Room"
-msgstr "Neuer Raum"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Gruppenchat"
 
-#: ../src/config.py:2452
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Dieser Bookmark hat ungültige Daten"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Bitte Serverfeld und Raumfeld ausfüllen oder Bookmark löschen."
 
-#: ../src/config.py:2707
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:2708
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Sie müssen einen Benutzernamen angeben, um diesen Account zu konfigurieren."
 
-#: ../src/config.py:2717 ../src/dialogs.py:1248
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/config.py:2718
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Sie müssen ein Passwort für das neue Konto eingeben."
 
-#: ../src/config.py:2722 ../src/dialogs.py:1253
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: ../src/config.py:2723 ../src/dialogs.py:1254
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
-#: ../src/config.py:2742
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Doppelte Jabber ID"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Dieser Kontakt bwurde in Gajim bereits konfiguriert."
 
-#: ../src/config.py:2760
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Account wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:2761 ../src/config.py:2794
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2688,23 +2861,23 @@ msgstr ""
 "oder durchklicken des Konto-Menüpunktes im Bearbeiten-Menü des Hauptfensters "
 "erreichen."
 
-#: ../src/config.py:2793
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:2809
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:2866
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Kontoname ist schon vergeben"
 
-#: ../src/config.py:2867
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/conversation_textview.py:272
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2712,209 +2885,206 @@ msgstr ""
 "Text unterhalb dieser Linie stellt dar, was seit ihrem letzten Besuch in "
 "diesem Gruppenchat gesagt wurde"
 
-#: ../src/conversation_textview.py:331
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:343
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:348
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:364
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "In Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:376
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "In Websuche URL fehlt ein \"%s\""
 
-#: ../src/conversation_textview.py:379
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Im _Internet suchen"
 
-#: ../src/conversation_textview.py:675
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:679
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "Vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "Auf diesem Computer fehlen die Python Bibliotheken für D-Bus"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Gajims D-BUS-Möglichkeiten können nicht genutzt werden"
-
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:58
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktname: <i>%s</i>"
 
-#: ../src/dialogs.py:59
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i> "
 
-#: ../src/dialogs.py:204
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: ../src/dialogs.py:261
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "Schlüssel-ID"
 
-#: ../src/dialogs.py:264
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status-Nachricht"
 
-#: ../src/dialogs.py:300
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Status-Nachricht"
 
-#: ../src/dialogs.py:375
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Als derzeitige Statusnachricht speichern"
 
-#: ../src/dialogs.py:376
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
 
-#: ../src/dialogs.py:396
-msgid "Jabber ID"
-msgstr "Jabber-ID"
-
-#: ../src/dialogs.py:397
-msgid "AIM Address"
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
 msgstr "AIM-Adresse"
 
-#: ../src/dialogs.py:398
-msgid "GG Number"
+#: ../src/dialogs.py:416
+#, fuzzy
+msgid "GG Number:"
 msgstr "GG Nummer"
 
-#: ../src/dialogs.py:399
-msgid "ICQ Number"
+#: ../src/dialogs.py:417
+#, fuzzy
+msgid "ICQ Number:"
 msgstr "ICQ-Nummer"
 
-#: ../src/dialogs.py:400
-msgid "MSN Address"
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
 msgstr "MSN-Adresse"
 
-#: ../src/dialogs.py:401
-msgid "Yahoo! Address"
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
 msgstr "Yahoo!-Adresse"
 
-#: ../src/dialogs.py:436
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bitte füllen Sie die Daten aus für den Kontakt, den Sie dem Konto %s "
 "hinzufügen wollen"
 
-#: ../src/dialogs.py:438
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bitte geben sie die Daten des neuen Kontakts ein"
 
-#: ../src/dialogs.py:446 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1252 ../src/roster_window.py:217
-#: ../src/roster_window.py:283 ../src/roster_window.py:319
-#: ../src/roster_window.py:371 ../src/roster_window.py:398
-#: ../src/roster_window.py:3271 ../src/roster_window.py:3273
-#: ../src/common/helpers.py:40
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/dialogs.py:584 ../src/dialogs.py:590
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer ID"
 
-#: ../src/dialogs.py:591
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine resource enthalten."
 
-#: ../src/dialogs.py:605
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Kontakt bereits im Roster"
 
-#: ../src/dialogs.py:606
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Der Kontakt befindet sich bereit in Ihrem Roster."
 
-#: ../src/dialogs.py:638
-msgid "User ID"
-msgstr "Benutzer-ID"
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "Ein GTK+ Jabber-Client"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:694
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:702
+#: ../src/dialogs.py:730
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:708
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:714
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Zuletzt möchten wird gerne allen Paket-Verwaltern danken."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr "Ins Deutsche übersetzt von Fridtjof Busse"
 
-#: ../src/dialogs.py:854
+#: ../src/dialogs.py:886
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Konnte nicht mit Port %s verbinden."
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
@@ -2922,292 +3092,305 @@ msgstr ""
 "Möglicherweise läuft bei Ihnen bereits ein Gajim. Der Dateitransfer\n"
 "wird abgebrochen."
 
-#: ../src/dialogs.py:997
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abonnement-Anforderung für Konto %s von %s"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anforderung von %s"
 
-#: ../src/dialogs.py:1044 ../src/roster_window.py:591
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
 #, python-format
 msgid "You are already in room %s"
 msgstr "Sie sind bereits im Raum %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "Sie können einem Chatraum erst beitreten, wenn Sie verbunden sind."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Betrete Chatraum mit Account %s"
 
-#: ../src/dialogs.py:1158
-msgid "Invalid room or server name"
-msgstr "Ungültiger Raum oder Servername"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Ungültige Jabber ID"
 
-#: ../src/dialogs.py:1159
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Der Raum- oder Servername enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Account %s"
 
-#: ../src/dialogs.py:1182
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:1183
+#: ../src/dialogs.py:1211
+#, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Geben Sie die JID oder den Spitznamen des Kontaktes ein,\n"
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1208 ../src/dialogs.py:1562 ../src/dialogs.py:1686
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:1209 ../src/dialogs.py:1563 ../src/dialogs.py:1687
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:1218 ../src/dialogs.py:1221
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 msgid "Invalid JID"
 msgstr "Ungültige JID"
 
-#: ../src/dialogs.py:1221
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:1230
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort zu ändern"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1295 ../src/notify.py:205 ../src/notify.py:366
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:1297 ../src/notify.py:213 ../src/notify.py:368
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
 #. chat message
-#: ../src/dialogs.py:1299 ../src/notify.py:232 ../src/notify.py:370
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #. single message
-#: ../src/dialogs.py:1299 ../src/notify.py:217 ../src/notify.py:370
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
 #. private message
-#: ../src/dialogs.py:1300 ../src/notify.py:224 ../src/notify.py:371
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:1300 ../src/gajim.py:1072 ../src/notify.py:379
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:1302 ../src/gajim.py:1204 ../src/notify.py:373
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Dateitransfer Anfrage"
 
-#: ../src/dialogs.py:1304 ../src/gajim.py:1050 ../src/gajim.py:1180
-#: ../src/notify.py:375
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Dateitransfer-Fehler"
 
-#: ../src/dialogs.py:1306 ../src/gajim.py:1240 ../src/gajim.py:1262
-#: ../src/gajim.py:1279 ../src/notify.py:377
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Dateitransfer beendet"
 
-#: ../src/dialogs.py:1307 ../src/gajim.py:1243 ../src/notify.py:377
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Dateitransfer gestoppt"
 
-#: ../src/dialogs.py:1309 ../src/gajim.py:948 ../src/notify.py:381
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: ../src/dialogs.py:1311 ../src/notify.py:197 ../src/notify.py:383
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/dialogs.py:1492
+#: ../src/dialogs.py:1521
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht mit Account %s"
 
-#: ../src/dialogs.py:1494
+#: ../src/dialogs.py:1523
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht in Account %s"
 
-#: ../src/dialogs.py:1496
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1522
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1589
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1590
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:1634
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsole für %s"
 
-#: ../src/dialogs.py:1636
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "XML Konsole"
 
-#: ../src/dialogs.py:1755
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatliste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1759
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1851
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Beschreibung: %s"
+
+#: ../src/dialogs.py:1878
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:1936
+#: ../src/dialogs.py:1965
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:2033
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatliste für %s"
 
-#: ../src/dialogs.py:2035
+#: ../src/dialogs.py:2064
 msgid "Privacy Lists"
 msgstr "Privatlist"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2124
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s hat Sie in %(room_jid)s eingeladen"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2130
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2193
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:2203 ../src/dialogs.py:2248
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:2208
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Wav Dateien"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:2253
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2298
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:2300
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
 #. # means number
-#: ../src/dialogs.py:2371
+#: ../src/dialogs.py:2413
 msgid "#"
 msgstr "Nr."
 
-#: ../src/dialogs.py:2377
+#: ../src/dialogs.py:2419
 msgid "Condition"
 msgstr "Bedingung"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2540
 msgid "when I am "
 msgstr "wenn Ich bin "
 
-#: ../src/disco.py:108
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Andere"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Konferenz"
 
-#: ../src/disco.py:412
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Sie müssen angemeldet sein um Dienste zu durchsuchen"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste durchsuchen für Konto %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3215,46 +3398,51 @@ msgstr ""
 "Es existiert keine Dienst an der Adresse, die sie angegeben haben oder er "
 "antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es erneut."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Dieser Art von Diest enthält keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Durchsuche %s mit Konto %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Durchsuche"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1137 ../src/disco.py:1257
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1294
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Durchsuche %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Beschreibung"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Datei"
@@ -3272,7 +3460,7 @@ msgstr "Fortschritt"
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Größe: %s"
@@ -3280,7 +3468,7 @@ msgstr "Größe: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Sie"
 
@@ -3289,8 +3477,8 @@ msgstr "Sie"
 msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:555
-#: ../src/tooltips.py:621
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Empfänger: "
 
@@ -3316,78 +3504,87 @@ msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
 msgid "Recipient: %s"
 msgstr "Empfänger: %s"
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Geben Sie ihre Nachricht ein:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Gegenseite hat Dateitransfer gestoppt"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Datei auswählen ..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim kann auf diese Datei nicht zugreifen"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Diese Datei wird von einem anderen Prozess verwendet."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Datei: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s möchte ihnen eine Datei senden:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
-msgstr "Eine Datei dieses Namens existiert bereits, und Sie haben nicht die Rechte, sie zu überschreiben."
+msgstr ""
+"Eine Datei dieses Namens existiert bereits, und Sie haben nicht die Rechte, "
+"sie zu überschreiben."
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Diese Datei existiert schon"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Was möchten Sie tun?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
-msgstr "Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien anzulegen."
+msgstr ""
+"Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien "
+"anzulegen."
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Datei speichern unter ..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3395,103 +3592,309 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:491
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:527 ../src/filetransfers_window.py:530
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Ungültige Datei"
 
-#: ../src/filetransfers_window.py:527
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Datei: "
 
-#: ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: ../src/filetransfers_window.py:551 ../src/tooltips.py:492
-#: ../src/tooltips.py:611
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:553 ../src/tooltips.py:615
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Absender: "
 
-#: ../src/filetransfers_window.py:741
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim benötigt einen laufenden Xserver. Breche ab ..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim benötigt PyGTK 2.6 oder höher"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim benötigt PyGTK 2.6 oder höher. Beende ..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim benötigt GTK 2.6 oder höher"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim benötigt GTK 2.6+. Breche ab ..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ runtine fehlt libglade-Unterstützung"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Bitte entfernen Sie Ihre derzeitige GTK+ Laufzeitumgebung und installieren "
+"Siedie aktuelle Version von %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Bitte stellen Sie sicher, dass GTK+ und PyGTK auf Ihrem System libglade-"
+"Unterstützung besitzen."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim benötigt PySQLite2 zum Starten"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim benötigt PySQLite2 zum Starten"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr "Gajim läuft bereits"
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"Eine andere Instanz von Gajim schein bereits zu laufen\n"
+"Trotzdem starten?"
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autorisierung für %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Akzeptieren Sie diese Anfrage?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Verbindung"
+
+#: ../src/gajim.py:609
+#, python-format
+msgid "Subject: %s"
+msgstr "Thema: %s"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "Fehler beim Senden von %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Autorisierung akzeptiert"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakt \"%s\" hat Sie autorisiert seinen oder ihren Staus zu sehen."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Sie werden den Kontakt ab sofort als offline sehen."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr ""
+"Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s ist jetzt %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Ihre Passphrase ist falsch"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Neue E-Mail auf %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Sie haben %d ungelesene E-Mail-Nachricht"
+msgstr[1] "Sie haben %d ungelesene E-Mail-Nachrichten"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"Von: %(from_address)s"
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s möchte ihnen eine Datei senden."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Sie haben %(filename)s erfolgreich von %(name)s erhalten."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Dateitransfer %(filename)s von %(name)s wurde gestoppt."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Sie haben%(filename)s erfolgreich an %(name)s gesendet."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Dateitransfer von %(filename)s an %(name)s wurde gestoppt."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Bitte geben Sie die Daten für Ihr neues Konto ein</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Konnte Einstellungen nicht speichern"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Sitzungsmanagment-Unterstützung nicht verfügbar (fehlendes gnome.ui Modul)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "zeige die Hilfe für einen bestimmten Befehl"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "Befehl"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Zeige Popup-Fenster mit der nächsten ungelesenen Nachricht"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr "Gibt eine Liste aller Kontakte im Roster aus. Eine Zeile je Kontakt"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "zeige nur Kontakte für das gegebene Konto"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Gibt eine Liste registrierter Konten aus"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Ändere den Status eines oder mehrerer Konten"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "Status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "Eins von: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "Nachricht"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "Statusnachricht"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3500,177 +3903,196 @@ msgstr ""
 "aller Konten für die \"Kontostatus mit globalem Status abgleichen\" "
 "aktiviert ist"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Zeige Chatfenster, so dass eine Nachricht an einen Kontakt gesendet werden "
 "kann"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID des Kontakts mit Sie chatten möchten"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "falls angegeben, wird der Kontakt von der Liste dieses Kontos gewählt"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
-msgstr "Sende neue Chat-Nachricht zu einem Kontakt im Roster. OpenPGP-Schlüssel und Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-Schlüssel, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
+msgstr ""
+"Sende neue Chat-Nachricht zu einem Kontakt im Roster. OpenPGP-Schlüssel und "
+"Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-"
+"Schlüssel, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID des Kontakts, der die Nachricht empfängt"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "PGP-Schlüssel"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "falls angegeben, wird die Nachricht damit verschlüsselt"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "falls angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
-msgstr "Sende neue Einzel-Nachricht zu einem Kontakt im Roster. OpenPGP-Schlüssel und "
-"Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-Schlüssel, "
-"lassen Sie 'OpenGPG-Schlüssel' einfach leer."
+msgstr ""
+"Sende neue Einzel-Nachricht zu einem Kontakt im Roster. OpenPGP-Schlüssel "
+"und Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-"
+"Schlüssel, lassen Sie 'OpenGPG-Schlüssel' einfach leer."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 msgid "subject"
 msgstr "Betreff"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 msgid "message subject"
 msgstr "Nachrichten-Betreff"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Zeige detaillierte Informationen über Kontakt"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID des Kontakts"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Zeige detaillierte Informationen über ein Konto"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Name des Kontos"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Sendet dem Kontakt eine Datei"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "Datei"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Dateipfad"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "Falls angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Zeige alle Einstellung und ihre Werte"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setze Wert von 'Schlüssel' auf 'Wert'."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'key' ist der Name der Einstellung, 'value' ist der Wert der einzustellende "
 "Wert"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Lösche eine Einstellung"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "Schlüssel"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "Name der zu löschenden Einstellung"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Schreibe die aktuellen Gajim-Einstellung in die Konfigurationsdatei"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Entfernt den Kontakt aus dem Roster"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Fügt Kontakt zum Roster hinzu"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 msgid "Adds new contact to this account"
 msgstr "Fügt neuen Kontakt zu diesem Konto hinzu"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Gibt derzeitigen Status zurück·(der globale, außer, es wird ein Account "
 "spezifiziert)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Gibt derzeitige Statusnachricht zurück·(der globale, außer, es wird ein "
 "Account angegeben)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Gibt die Zahl der ungelesenen Nachrichten zurück"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 msgid "Starts chat, using this account"
 msgstr "Starte Chat mit diesem Account"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "XML Konsole"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3679,16 +4101,11 @@ msgstr ""
 "'%s' ist nicht in ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Unbekannte D-BUS-Version: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3697,16 +4114,16 @@ msgstr ""
 "Verwendung: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3715,7 +4132,7 @@ msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
 "Befehl ist einer von:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3724,202 +4141,6 @@ msgstr ""
 "Argument \"%s\" wurde nicht angegeben. \n"
 "Geben Sie \"%s help %s\" ein für Hilfe"
 
-#: ../src/gajim.py:56
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim benötigt einen laufenden Xserver. Breche ab ..."
-
-#: ../src/gajim.py:60
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim benötigt PyGTK 2.6 oder höher"
-
-#: ../src/gajim.py:61
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim benötigt PyGTK 2.6 oder höher. Beende ..."
-
-#: ../src/gajim.py:63
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim benötigt GTK 2.6 oder höher"
-
-#: ../src/gajim.py:64
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim benötigt GTK 2.6+. Breche ab ..."
-
-#: ../src/gajim.py:69
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ runtine fehlt libglade-Unterstützung"
-
-#: ../src/gajim.py:71
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Bitte entfernen Sie Ihre derzeitige GTK+ Laufzeitumgebung und installieren "
-"Siedie aktuelle Version von %s"
-
-#: ../src/gajim.py:73
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Bitte stellen Sie sicher, dass GTK+ und PyGTK auf Ihrem System libglade-"
-"Unterstützung besitzen."
-
-#: ../src/gajim.py:78
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim benötigt PySQLite2 zum Starten"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:159
-msgid "Gajim is already running"
-msgstr "Gajim läuft bereits"
-
-#: ../src/gajim.py:160
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Eine andere Instanz von Gajim schein bereits zu laufen\n"
-"Trotzdem starten?"
-
-#: ../src/gajim.py:261
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autorisierung für %s (id: %s)"
-
-#: ../src/gajim.py:262
-msgid "Do you accept this request?"
-msgstr "Akzeptieren Sie diese Anfrage?"
-
-#: ../src/gajim.py:590
-#, python-format
-msgid "Subject: %s"
-msgstr "Thema: %s"
-
-#: ../src/gajim.py:633
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "Fehler beim Senden von %s ( %s )"
-
-#: ../src/gajim.py:673
-msgid "Authorization accepted"
-msgstr "Autorisierung akzeptiert"
-
-#: ../src/gajim.py:674
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakt \"%s\" hat Sie autorisiert seinen oder ihren Staus zu sehen."
-
-#: ../src/gajim.py:682
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
-
-#: ../src/gajim.py:683
-msgid "You will always see him or her as offline."
-msgstr "Sie werden den Kontakt ab sofort als offline sehen."
-
-#: ../src/gajim.py:726
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden"
-
-#: ../src/gajim.py:727 ../src/common/connection.py:402
-msgid "Check your connection or try again later."
-msgstr ""
-"Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
-
-#: ../src/gajim.py:871 ../src/roster_window.py:1082
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s ist jetzt %s (%s)"
-
-#: ../src/gajim.py:958
-msgid "Your passphrase is incorrect"
-msgstr "Ihre Passphrase ist falsch"
-
-#: ../src/gajim.py:959
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1061
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Neue E-Mail auf %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1063
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Sie haben %d ungelesene E-Mail-Nachricht"
-msgstr[1] "Sie haben %d ungelesene E-Mail-Nachrichten"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1068
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr "\nVon: %(from_address)s"
-
-#: ../src/gajim.py:1201
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s möchte ihnen eine Datei senden."
-
-#: ../src/gajim.py:1263
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Sie haben %(filename)s erfolgreich von %(name)s erhalten."
-
-#. ft stopped
-#: ../src/gajim.py:1267
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Dateitransfer %(filename)s von %(name)s wurde gestoppt."
-
-#: ../src/gajim.py:1280
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Sie haben%(filename)s erfolgreich an %(name)s gesendet."
-
-#. ft stopped
-#: ../src/gajim.py:1284
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Dateitransfer von %(filename)s an %(name)s wurde gestoppt."
-
-#: ../src/gajim.py:1313
-msgid "vCard publication succeeded"
-msgstr "vCard erfolgreich veröffentlicht"
-
-#: ../src/gajim.py:1313
-msgid "Your personal information has been published successfully."
-msgstr "Ihre persönlichen Informationen wurden erfolgreich veröffentlicht."
-
-#: ../src/gajim.py:1322
-msgid "vCard publication failed"
-msgstr "vCard Veröffentlichung fehlgeschlagen"
-
-#: ../src/gajim.py:1322
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
-"aufgetreten, versuchen Sie es später nochmals."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1701
-msgid "Could not save your settings and preferences"
-msgstr "Konnte Einstellungen nicht speichern"
-
-#: ../src/gajim.py:1923
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Sitzungsmanagment-Unterstützung nicht verfügbar (fehlendes gnome.ui Modul)"
-
 #: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Thema"
@@ -3937,117 +4158,117 @@ msgstr "Sie können ihr derzeitiges Theme nicht löschen"
 msgid "Please first choose another for your current theme."
 msgstr "Bitte wählen Sie zuerst einen anderen Namen für ihr derzeitiges Theme."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Privater Chat"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Sie sind nicht mehr im Raum \"%s\" oder \"%s\" hat den Raum verlassen."
 
-#: ../src/groupchat_control.py:136
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Gruppenchat"
 
-#: ../src/groupchat_control.py:136
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Gruppenchat"
 
-#: ../src/groupchat_control.py:305
+#: ../src/groupchat_control.py:315
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
-#: ../src/groupchat_control.py:641
-msgid "This room has no subject"
-msgstr "Dieser Raum hat kein Thema"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:740
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s wurde rausgeschmissen: %(reason)s"
 
-#: ../src/groupchat_control.py:744
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s rausgeschmissen: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:751
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt: %(reason)s"
 
-#: ../src/groupchat_control.py:755
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s gebannt: %(reason)s"
 
-#: ../src/groupchat_control.py:763
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:765
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: ../src/groupchat_control.py:843
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s hat den Raum verlassen"
 
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:850 ../src/roster_window.py:1085
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s ist jetzt %s"
 
-#: ../src/groupchat_control.py:968 ../src/groupchat_control.py:986
-#: ../src/groupchat_control.py:1079 ../src/groupchat_control.py:1095
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Spitzname nicht gefunden: %s"
 
-#: ../src/groupchat_control.py:1013
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Dieser Raum hat kein Thema"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1050
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s scheint keine gültige JID zu sein"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Kein Kommando: /%s (wenn Sie dies senden wollen, setzen Sie /say voran)"
 
-#: ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandos: %s"
 
-#: ../src/groupchat_control.py:1156
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -4060,7 +4281,7 @@ msgstr ""
 "\" enthält. Wenn die JIDderzeit im Raum ist, wird er/sie/es ebenfalls "
 "gebannt. Unterstützt KEINE Leerzeichen im Spitznamen."
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4068,24 +4289,26 @@ msgstr ""
 "Bedienung: /%s <Spitzname>, öffnet ein privates Chatfenster mit dem "
 "spezifierten Inhaber."
 
-#: ../src/groupchat_control.py:1166
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bedienung: /%s, leert das Textfenster."
 
-#: ../src/groupchat_control.py:1168
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
-msgstr "Bedienung: /%s [Grund], schließt das aktuelle Fenster oder Tab, mit Anzeige eines Grundes falls angegeben."
+msgstr ""
+"Bedienung: /%s [Grund], schließt das aktuelle Fenster oder Tab, mit Anzeige "
+"eines Grundes falls angegeben."
 
-#: ../src/groupchat_control.py:1171
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Verwendung: /%s, versteckt die Chatbuttons."
 
-#: ../src/groupchat_control.py:1173
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -4094,7 +4317,7 @@ msgstr ""
 "Bedienung: /%s <JID> [Grund], lädt die JID in den aktuellen Raum, optional "
 "mit der Angabe eines Grundes."
 
-#: ../src/groupchat_control.py:1177
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4103,7 +4326,7 @@ msgstr ""
 "Bedienung: /%s <Raum>@<Server> [/Spitzname], bietet den Beitritt zu "
 "Raum@Server an, optional mit Spitznamen."
 
-#: ../src/groupchat_control.py:1181
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4114,7 +4337,7 @@ msgstr ""
 "Raumes und zeigt optional einen Grund. Unterstützt KEINE Leerzeichen im "
 "Spitznamen."
 
-#: ../src/groupchat_control.py:1186
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -4123,7 +4346,7 @@ msgstr ""
 "Bedienung: /%s <Aktion>, sendet die Aktion im aktuellen Raum. Verwende "
 "dritte Person, z.B. /%s explodiert)."
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4133,24 +4356,23 @@ msgstr ""
 "Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
 "Spitznamen."
 
-#: ../src/groupchat_control.py:1195
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Bedienung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Raum."
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1250
 #, python-format
 msgid "Usage: /%s , display the names of room occupants."
-msgstr ""
-"Benutzung: /%s , zeigt die Namen der Raumbesucher."
+msgstr "Benutzung: /%s , zeigt die Namen der Raumbesucher."
 
-#: ../src/groupchat_control.py:1203
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Benutzung: /%s [topic], zeigt oder aktualisiert das derzeitige Raumthema."
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4158,82 +4380,82 @@ msgstr ""
 "Benutzung: /%s <Nachricht>, sendet eine Nachricht ohne andere Befehle zu "
 "beachten."
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Keine Hilfe vorhanden für /%s"
 
-#: ../src/groupchat_control.py:1251
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Möchten Sie den Raum \"%s\" wirklich verlassen?g"
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr ""
 "Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Raum "
 "geschlossen."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Bitte bestimmen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
 
-#: ../src/groupchat_control.py:1325
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Bookmark existiert schon"
 
-#: ../src/groupchat_control.py:1326
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Der Raum \"%s\" ist schon in den Bookmarks."
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark wurde erfolgreich hinzugefügt"
 
-#: ../src/groupchat_control.py:1336
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Sie können ihre Bookmarks über das Aktionen-Menü in der Kontaktliste "
 "bearbeiten"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1446
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rausschmeißen"
 
-#: ../src/groupchat_control.py:1447 ../src/groupchat_control.py:1725
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1724
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Es wurde ein Programmfehler entdeckt"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4241,89 +4463,91 @@ msgstr ""
 "Es ist vermutlich nicht fatal, aber der Fehler sollte trotzdem den "
 "Entwicklern gemeldet werden"
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "Bug melden"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Fehler bei der Dateianalyse:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Konnte nicht an %s schreiben. Sitzungmanagment-Unterstützung wird nicht "
 "funktionieren"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr "Erweiterung wird nicht unterstützt."
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Bild kann nicht im %(type)s-Format gespeichert werden. Als %(new_filename)s speichern?"
+msgstr ""
+"Bild kann nicht im %(type)s-Format gespeichert werden. Als %(new_filename)s "
+"speichern?"
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 msgid "Save Image as..."
 msgstr "Bild speichern unter ..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Kann Verlaufslog-Datenkbank nicht finden"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Kontakte"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Nachricht"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Betreff"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Möchtne Sie die Datenbank säubern? (NICHT EMPFOHLEN WENN GAJIM GERADE LÄUFT)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4331,130 +4555,180 @@ msgid ""
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Der allozierte Datenbankspeicherplatz wird nicht freigegeben, er wird nur wiederverwendbar. Wenn Sie wirklich den Speicherplatz reduzieren möchten, klicken Sie JA, ansonsten NEIN.\n"
+"Der allozierte Datenbankspeicherplatz wird nicht freigegeben, er wird nur "
+"wiederverwendbar. Wenn Sie wirklich den Speicherplatz reduzieren möchten, "
+"klicken Sie JA, ansonsten NEIN.\n"
 "\n"
 "Falls Sie JA klicken, warten Sie bitte einen Augenblick ..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Exportiere Verlaufslog ..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s·sagte um·%(time)s:·%(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "wer"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Möchten Sie wirklich alle Logs des ausgewählten Kontakts löschen?"
 msgstr[1] "Möchten Sie wirklich alle Logs des ausgewählten Kontakte löschen?"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Dies ist ein unwiderruflicher Vorgang."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
 msgstr[1] "Möchten Sie die ausgewählten Nachrichten wirklich löschen?"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Unterhaltungs-Verlauf mit %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ist jezt %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:192
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ist jetzt %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status ist jetzt: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status ist jetzt: %(status)s"
 
-#: ../src/message_window.py:254
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../src/message_window.py:255
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:190
+#: ../src/notify.py:196
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s änderte Status"
 
-#: ../src/notify.py:200
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s angemeldet"
 
-#: ../src/notify.py:208
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s abgemeldet"
 
-#: ../src/notify.py:220
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Neue einzelne Nachricht von %(nickname)s"
 
-#: ../src/notify.py:228
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Neue private Nachricht von Raum %s"
 
-#: ../src/notify.py:229
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s:·%(message)s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/roster_window.py:138
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Konnte Bild nicht laden"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Einladung empfangen"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr ""
+"Sie müssen angemeldet sein, um Kontakt-Informationen zu veröffentlichen"
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "vCard Veröffentlichung fehlgeschlagen"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
+"aufgetreten, versuchen Sie es später nochmals."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Sie müssen angemeldet sein, um Kontakt-Informationen abzurufen"
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:298 ../src/common/helpers.py:40
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Beobachter"
 
-#: ../src/roster_window.py:595 ../src/roster_window.py:2570
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Sie können einem Chatraum nicht beitreten, wenn Sie unsichtbar sind."
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:791
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "an %s Konto"
 
 #. disco
-#: ../src/roster_window.py:796
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "mit %s Konto"
@@ -4462,41 +4736,53 @@ msgstr "mit %s Konto"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:802 ../src/systray.py:181 ../src/systray.py:186
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "mit Konto %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:868
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "von Konto %s"
 
-#: ../src/roster_window.py:888
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Verwalte Bookmarks ..."
 
-#: ../src/roster_window.py:912
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "für Konto %s"
 
 #. History manager
-#: ../src/roster_window.py:933
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Verlaufsmanager"
 
-#: ../src/roster_window.py:942
-msgid "_Join New Room"
-msgstr "_Neuen Raum betreten"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "_Chatraum betreten"
+
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:1221
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Alle ungelesenen Ereignisse lesen, bevor der Account entfernt wird."
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:1222
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4504,11 +4790,11 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten von diesem Transport "
 "austauschen."
 
-#: ../src/roster_window.py:1224
+#: ../src/roster_window.py:1265
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../src/roster_window.py:1229
+#: ../src/roster_window.py:1270
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4517,71 +4803,71 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten von diesen Transporten "
 "austauschen:%s"
 
-#: ../src/roster_window.py:1273
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel Zuweisen"
 
-#: ../src/roster_window.py:1274
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:1411 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
 msgid "_New room"
 msgstr "_Neuer Raum"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Ich würde dich gerne in meine Liste aufnehmen"
 
-#: ../src/roster_window.py:1645
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "_Umbenennen"
 
-#: ../src/roster_window.py:1676
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Anmelden"
 
-#: ../src/roster_window.py:1685
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "_Abmelden"
 
-#: ../src/roster_window.py:1780
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:1856
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1857
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt ihren Status."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:2106
 #, 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:1893
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
-#: ../src/roster_window.py:2100
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:2104
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4589,7 +4875,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:2108
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4597,17 +4883,17 @@ 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:2109
+#: ../src/roster_window.py:2334
 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"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2113
+#: ../src/roster_window.py:2338
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:2117
+#: ../src/roster_window.py:2342
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4617,34 +4903,34 @@ msgstr ""
 "entziehen Sie ihnen auch die Authorisation, wodurch die Kontakte Sie nur "
 "noch als offline sehen werden."
 
-#: ../src/roster_window.py:2187
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
-#: ../src/roster_window.py:2188
+#: ../src/roster_window.py:2412
 #, 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:2193
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Passphrase speichern"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
-#: ../src/roster_window.py:2202
+#: ../src/roster_window.py:2426
 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:2254 ../src/roster_window.py:2311
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2255 ../src/roster_window.py:2312
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4652,165 +4938,132 @@ 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:2271
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:2272
+#: ../src/roster_window.py:2496
 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:2748 ../src/roster_window.py:2754
-msgid "You have unread messages"
-msgstr "Sie haben ungelesene Nachrichten"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2749 ../src/roster_window.py:2755
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 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:3540
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Setze %s in Gruppe %s"
 
-#: ../src/roster_window.py:3547
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Mache %s und %s Metakontakte"
 
-#: ../src/roster_window.py:3729
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht ..."
 
-#: ../src/systray.py:142
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "Ändere _Statusnachricht ..."
 
-#: ../src/systray.py:219
-msgid "Hide this menu"
-msgstr "Versteckt dieses Menü"
-
-#: ../src/systraywin32.py:269
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d ungelesene Nachricht"
-msgstr[1] "Gajim - %d ungelesene Nachrichten"
-
-#: ../src/tooltips.py:306
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] " %d ungelesene Nachricht"
-msgstr[1] " %d ungelesene Nachrichten"
-
-#: ../src/tooltips.py:312
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] " %d ungelesene Einzel-Nachricht"
-msgstr[1] " %d ungelesene Einzel-Nachrichten"
-
-#: ../src/tooltips.py:318
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] " %d ungelesene Gruppenchat-Nachricht"
-msgstr[1] " %d ungelesene Gruppenchat-Nachrichten"
-
-#: ../src/tooltips.py:324
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] " %d ungelesene private Nachricht"
-msgstr[1] " %d ungelesene private Nachrichten"
-
-#: ../src/tooltips.py:339 ../src/tooltips.py:341
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:375
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Rolle:"
 
-#: ../src/tooltips.py:376
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Zugehörigkeit: "
 
-#: ../src/tooltips.py:378 ../src/tooltips.py:518
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:387 ../src/tooltips.py:522 ../src/tooltips.py:547
-#: ../src/tooltips.py:658
-msgid "Status: "
-msgstr "Status: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:495
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:552
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Letzter Status auf %s"
 
-#: ../src/tooltips.py:554
-#, python-format
-msgid "Since %s"
-msgstr "Seit %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "seit %s"
 
-#: ../src/tooltips.py:614
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber-ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:627
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:633
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Übertragen: "
 
-#: ../src/tooltips.py:636 ../src/tooltips.py:657
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:642 ../src/tooltips.py:645
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:653
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Steht still"
 
-#: ../src/tooltips.py:655
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Übertrage"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Dieser Dienst hat nicht mit detaillierten Informationen geantwortet"
 
-#: ../src/tooltips.py:690
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4818,25 +5071,25 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich verwaltet oder defekt"
 
-#. keep identation
-#: ../src/vcard.py:193
-msgid "Could not load image"
-msgstr "Konnte Bild nicht laden"
-
-#: ../src/vcard.py:305
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:326
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "seit %s"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Zugehörigkeit: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4844,7 +5097,7 @@ msgstr ""
 "Dieser Kontakt ist an Ihren Anwesenheitsinformationen interessiert, aber Sie "
 "sindnicht an seiner/ihrer Anwesenheit interessiert"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4852,14 +5105,14 @@ msgstr ""
 "Sie sind an den Anwesenheitsinformationen des Kontakts interessiert, aber er/"
 "sieist nicht an ihren interessiert"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:269
 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:358
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4867,144 +5120,122 @@ msgstr ""
 "Sie sind nicht an der Anwesenheit des Kontakts interessiert, und er/sie "
 "istnicht interessiert an ihrer"
 
-#: ../src/vcard.py:367
+#: ../src/vcard.py:279
 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:379 ../src/vcard.py:402
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " resource mit Priorität "
 
-#: ../src/vcard.py:479
-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:512
-msgid "Without a connection, you can not get your contact information."
-msgstr "Sie müssen angemeldet sein, um Kontakt-Informationen abzurufen"
-
-#: ../src/vcard.py:518
-msgid "Personal details"
-msgstr "Persönliche Details"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/check_paths.py:87 ../src/common/check_paths.py:98
-#: ../src/common/check_paths.py:105
+#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s ist eine Datei, kein Verzeichnis"
 
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:99
-#: ../src/common/check_paths.py:106 ../src/common/check_paths.py:114
+#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
-#: ../src/common/check_paths.py:113
+#: ../src/common/check_paths.py:108
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s ist ein Verzeichnis, sollte aber eine Datei sein"
 
-#: ../src/common/check_paths.py:129
+#: ../src/common/check_paths.py:124
 #, python-format
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (auch python-pysqlite2 genannt) Abhängigkeit fehlt. Beende ..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Dienst nicht verfügbar: Gajim ist nicht aktiv oder remote_control ist "
-"deaktiviert"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus auf diesem Computer nicht vorhanden oder das Python-Modul fehlt"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Sitzungsbus ist nicht verfügbar.\"Bitte lesen Sie http://trac.gajim.org/wiki/"
-"GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 "Verwende DBus und Benachrichtigungs-Daemon um Benachrichtigungen zu zeigen"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Zeit in Minuten, nach der Ihr Status auf abwesend gesetzt wird"
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Abwesend, da untätig"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Zeit in Minuten, nach der Ihr Status auf nicht verfügbar gesetzt wird."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Nicht verfügbar, da untätig"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:88
 msgid "Language used by speller"
 msgstr "Sprache der Rechtschreib-Prüfung"
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Falls wahr, entferne */_ nicht. So wird *abc* fett aber * * wird nicht "
 "entfernt."
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Füge * und [n] in die Kontaktleiste?"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5012,12 +5243,12 @@ msgstr ""
 "Wie viele Zeilen von der vorherigen Unterhaltung gespeichert werden, wenn "
 "ein Chat Tab/Fenster wieder geöffnet wird."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5025,11 +5256,11 @@ msgstr ""
 "Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
 "(Mirabilis ICQ-Client Standardeinstellung)."
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5038,23 +5269,23 @@ msgstr ""
 "Entweder eine spezielle URL mit %s, wobei %s das Word/Phrase ist oder "
 "'WIKTIONARY', was bedeutet, dass ein Wörterbuch verwendet wird."
 
-#: ../src/common/config.py:143
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Falls aktiviert kann Gajim aus der Ferne mittels gajim-remote kontrolliert "
 "werden."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Gruppenchat Tab/Fenster geschlossen wird."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -5062,7 +5293,7 @@ msgstr ""
 "Immer fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-"
 "seperierten\"Liste von Raumnamen geschlossen wird."
 
-#: ../src/common/config.py:149
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -5070,7 +5301,7 @@ msgstr ""
 "Niemals fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-"
 "seperiertenListe von Raumnamen geschlossen wird."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5078,23 +5309,23 @@ msgstr ""
 "Überschreibt den Host für Datenübertragung für den Fall von NAT/Port-"
 "Forwarding"
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC-Standard sagt KiB = 1024 Byte, KB = 1000 Byte."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Tab bei einer einzelnen Unterhaltung anzeigen?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:171
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Tab-Grenze im Chat-Fenster anzeigen?"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Schließen-Button im Tab anzeigen?"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -5102,7 +5333,7 @@ msgstr ""
 "Eine mit Semilkolon getrennte List von Worten, die in einem Gruppenchat "
 "hervorgehoben werden."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5111,11 +5342,11 @@ msgstr ""
 "geklickt wird.Diese Option wird nur beachtet, wenn die Trayicon-"
 "Unterstützung aktiv ist."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Falls wahr, registriert Gajim bei jedem Start für xmpp://."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5123,15 +5354,16 @@ msgstr ""
 "Falls wahr. wird Gajim ein Icon auf jedem Tab mit ungelesenen Nachrichten "
 "anzeigen.Abhängig vom Theme ist dieses Icon animiert."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Falls aktiviert, wird Gajim für jeden Kontakt die Statusnachricht, falls "
 "nicht leer, unter dem jeweiligen Kontaktnamen im Roster anzeigen"
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -5139,7 +5371,7 @@ msgstr ""
 "Falls aktiviert fragt Gajim nach einem Avatar für jeden Kontakt, der beim "
 "letzten Mal keinen hatte oder einen veralteten hat."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:192
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -5147,26 +5379,32 @@ msgstr ""
 "Falls deaktiviert, werden Sie keine Statuszeile im Chat sehen, wenn ein "
 "Kontakt seinen Status und/oder seine Statusnachricht ändert."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:196
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
-"Falls aktiv, werden wiederhergestellte Nachrichten mit einer kleineren Schrift als der Standard dargestellt."
+"Falls aktiv, werden wiederhergestellte Nachrichten mit einer kleineren "
+"Schrift als der Standard dargestellt."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr "Zeige keinen Avatar für den Transport selber."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:198
+#, fuzzy
+msgid "Don't show roster in the system taskbar."
+msgstr "Zeige keinen Avatar für den Transport selber."
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -5176,17 +5414,19 @@ msgstr ""
 "sind, lasse das Fenster bei neuen Ereignissen aufblitzen (Standardverhalten "
 "in den meisten Window-Managers) "
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 mag keine sha info wenn ein passwortgeschützter Raum betreten "
 "wird. Deaktivieren Sie diese Option um keine sha info in Gruppenchats zu "
 "senden"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:196
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5194,7 +5434,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Kontrolliert das Fenster in dem neue Nachrichten platziert werden.\n"
 "'always' - Alle Nachrichten landen in einem einzelnen Fenster.\n"
@@ -5205,57 +5445,74 @@ msgstr ""
 "einem speziellen Fenster. Falls Sie diese Option ändern, muss Gajim neu "
 "gestartet werden, damit die Änderungen übernommen werden"
 
-#: ../src/common/config.py:197
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Wenn deaktiviert, werden Sie den Avatar nicht mehr im Chatfenster sehen"
 
-#: ../src/common/config.py:198
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Wenn aktiviert, schließt die Escape-Taste ein Tab/Fenster"
 
-#: ../src/common/config.py:199
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Versteckt die Button im Gruppenchat-Fenster"
 
-#: ../src/common/config.py:200
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Versteckt die Buttons im Zwei-Personen-Chatfenster"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Versteckt das Banner im Gruppenchat-Fenster"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster"
 
-#: ../src/common/config.py:203
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "Versteckt die Raumbenutzerliste im Gruppenchat-Fenster"
 
-#: ../src/common/config.py:204
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:205
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:206
-msgid "List of colors that will be used to color nicknames in groupchats"
-msgstr "Farbliste, die für die Einfärbung von Spitzenamen im Gruppenchat verwendet wird"
+#: ../src/common/config.py:214
+#, fuzzy
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+"Farbliste, die für die Einfärbung von Spitzenamen im Gruppenchat verwendet "
+"wird"
 
-#: ../src/common/config.py:207
-msgid "Ctrl-Tab go to next composing tab when none is unread"
-msgstr "Strg-Tab, um zum nächsten Verfassen-Fenster zu gehen wenn keines ungelesen ist"
+#: ../src/common/config.py:215
+#, fuzzy
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+"Strg-Tab, um zum nächsten Verfassen-Fenster zu gehen wenn keines ungelesen "
+"ist"
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:240
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 Workaround"
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5263,97 +5520,108 @@ msgstr ""
 "Wenn aktiviert, wird Gajim Ihre IP und die in der file_transfer_proxies "
 "Optiondefinierten Proxies für den Datentransfer verwenden."
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
 msgid "all or space separated status"
 msgstr "alle oder Leerzeichen-getrennter Status"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:328
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nein' oder 'beide'"
 
-#: ../src/common/config.py:307 ../src/common/config.py:309
-#: ../src/common/config.py:310 ../src/common/config.py:313
-#: ../src/common/config.py:314
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
 msgid "'yes', 'no' or ''"
 msgstr "'ja, 'nein' oder ''"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, also hinterlasst eine Nachricht."
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Arbeit"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:326
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben"
 
-#: ../src/common/config.py:330
-msgid "I'm avavilable"
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
 msgstr "Ich bin angemeldet"
 
-#: ../src/common/config.py:331
-msgid "I'm free for chat"
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten"
 
-#: ../src/common/config.py:332
-msgid "Be right back"
-msgstr "Bin gleich zurück"
-
-#: ../src/common/config.py:333
-msgid "I'm not available"
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
 msgstr "Ich bin nicht da"
 
-#: ../src/common/config.py:334
-msgid "Do not disturb"
+#: ../src/common/config.py:356
+#, fuzzy
+msgid "Do not disturb."
 msgstr "Bitte nicht stören"
 
-#: ../src/common/config.py:335 ../src/common/config.py:336
-msgid "Bye !"
+#: ../src/common/config.py:357 ../src/common/config.py:358
+#, fuzzy
+msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5362,7 +5630,7 @@ msgstr ""
 "muc_highlights_works-Liste enthält oder wenn die Nachricht Ihren Nickname "
 "erhält."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5370,97 +5638,211 @@ msgstr ""
 "Abzuspielender Ton, falls eine MUC-Nachricht ankommt. (Diese Einstellung "
 "wirdnur beachtet, wenn notify_on_all_muc_messages aktiviert ist)"
 
-#: ../src/common/config.py:354 ../src/common/optparser.py:188
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:358 ../src/common/optparser.py:174
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "gemüse"
 
-#: ../src/common/config.py:362
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "menschlich"
 
-#: ../src/common/config.py:366
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection.py:176
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr "Fehler beim Betreten des Raum"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid "Wrong host"
+msgstr "Falscher Host"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Der Host, den Sie für die erweiterte Option ft_override_host_to_send angeben "
+"haben ist ungültig und wird ignoriert."
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+"Registrierungsinformation für Transport %s sind nicht rechtzeitig angekommen"
+
+#: ../src/common/connection_handlers.py:1449
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Spitzname nicht erlaubt: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Fehler beim Betreten des Raum"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Für das Betreten dieses Raumes ist ein Passwort nötig."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Sie sind aus diesem Raum gebannt"
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Dieser Raum existiert nicht."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "Raumerstellung ist beschränkt"
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Sie müssen Ihren registrierten Spitznamen verwenden"
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Sie sind nicht in der Mitgliedliste"
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Der gwünschte Benutzername wird bereits verwendet oder ist von einem anderen "
+"Benutzer registriert.\n"
+"Bitte geben Sie einen anderen Benutzernamen an:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Ich würde dich gerne zu meiner Liste hinzufügen."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "wir haben jetzt %s abonniert"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Anfrage zur Kündigung des Abonnements von %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "%s hat das Abonnement beendet"
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Jid %s ist nicht RFC-konform. Sie wird nicht zu ihrem Roster hinzugefügt. "
+"Verwenden Sie ein Roster-Managment-Tool wie <http://jru.jabberstudio.org/>, "
+"um ihn zu entfernen"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:177
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Um weiter Senden um Empfangen zu können, müssen Sie sich erneut verbinden."
 
-#: ../src/common/connection.py:189 ../src/common/connection.py:215
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Transport %s beantwortete unsere Registrierungsanfrage nicht korrekt."
 
 #. wrong answer
-#: ../src/common/connection.py:214
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:401 ../src/common/connection.py:437
-#: ../src/common/connection.py:860
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Konnte nicht mit %s verbinden"
 
-#: ../src/common/connection.py:415
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Verbunden mit Server %s:%s mit %s"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal"
 
-#: ../src/common/connection.py:463
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie ihren Benutzernamen und Passwort."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:577
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "Keine OpenPGP-Passphrase gewählt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:579
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Sie werden ohne OpenPGP mit %s verbunden."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:616
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "unsichtbar"
 
-#: ../src/common/connection.py:617
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "abgemeldet"
 
-#: ../src/common/connection.py:618
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Ich bin %s"
 
 #. we're not english
-#: ../src/common/connection.py:703
-msgid "[This message is encrypted]"
+#. one  in locale and one en
+#: ../src/common/connection.py:699
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Diese Nachricht ist verschlüsselt]"
 
-#: ../src/common/connection.py:746
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5469,314 +5851,543 @@ msgstr ""
 "Thema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:885
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt aufgrund eines Unsichtbar-Status"
 
-#: ../src/common/connection_handlers.py:51
-msgid "Unable to load idle module"
-msgstr "Fehler beim Betreten des Raum"
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Auf diesem Computer fehlen die Python Bibliotheken für D-Bus"
 
-#: ../src/common/connection_handlers.py:176
-msgid "Wrong host"
-msgstr "Falscher Host"
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Gajims D-BUS-Möglichkeiten können nicht genutzt werden"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
+"pysqlite2 (auch python-pysqlite2 genannt) Abhängigkeit fehlt. Beende ..."
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Dienst nicht verfügbar: Gajim ist nicht aktiv oder remote_control ist "
+"deaktiviert"
 
-#: ../src/common/connection_handlers.py:176
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus auf diesem Computer nicht vorhanden oder das Python-Modul fehlt"
+
+#: ../src/common/exceptions.py:46
 msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
 msgstr ""
-"Der Host, den Sie für die erweiterte Option ft_override_host_to_send angeben "
-"haben ist ungültig und wird ignoriert."
+"Sitzungsbus ist nicht verfügbar.\"Bitte lesen Sie http://trac.gajim.org/wiki/"
+"GajimDBus"
 
-#: ../src/common/connection_handlers.py:588
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Kein"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "wer"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Straße:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "für "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "Datei"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Ereignis"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Fortsetzen"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Löschen"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
 msgstr ""
-"Registrierungsinformation für Transport %s sind nicht rechtzeitig angekommen"
 
-#: ../src/common/connection_handlers.py:1438
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Spitzname nicht erlaubt: %s"
+msgid "%0 o'clock"
+msgstr ""
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1507
-#: ../src/common/connection_handlers.py:1510
-#: ../src/common/connection_handlers.py:1513
-#: ../src/common/connection_handlers.py:1516
-#: ../src/common/connection_handlers.py:1519
-#: ../src/common/connection_handlers.py:1522
-#: ../src/common/connection_handlers.py:1530
-msgid "Unable to join room"
-msgstr "Fehler beim Betreten des Raum"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1508
-msgid "A password is required to join this room."
-msgstr "Für das Betreten dieses Raumes ist ein Passwort nötig."
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1511
-msgid "You are banned from this room."
-msgstr "Sie sind aus diesem Raum gebannt"
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1514
-msgid "Such room does not exist."
-msgstr "Dieser Raum existiert nicht."
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1517
-msgid "Room creation is restricted."
-msgstr "Raumerstellung ist beschränkt"
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1520
-msgid "Your registered nickname must be used."
-msgstr "Sie müssen Ihren registrierten Spitznamen verwenden"
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
-msgid "You are not in the members list."
-msgstr "Sie sind nicht in der Mitgliedliste"
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1531
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
 msgstr ""
-"Der gwünschte Benutzername wird bereits verwendet oder ist von einem anderen "
-"Benutzer registriert.\n"
-"Bitte geben Sie einen anderen Benutzernamen an:"
 
-#: ../src/common/connection_handlers.py:1577
-msgid "I would like to add you to my roster."
-msgstr "Ich würde dich gerne zu meiner Liste hinzufügen."
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1598
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "wir haben jetzt %s abonniert"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Auf %s registrieren"
 
-#: ../src/common/connection_handlers.py:1600
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Anfrage zur Kündigung des Abonnements von %s"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1602
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s hat das Abonnement beendet"
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1772
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Arbeit"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Kein"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Ereignis"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
 msgstr ""
-"Jid %s ist nicht RFC-konform. Sie wird nicht zu ihrem Roster hinzugefügt. "
-"Verwenden Sie ein Roster-Managment-Tool wie <http://jru.jabberstudio.org/>, "
-"um ihn zu entfernen"
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Ungültiges Zeichen im Benutzernamen"
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Server-Adresse wird benötigt."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Ungültiges Zeichen in Hostname."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Ungültiges Zeichen in Resource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Angemeldet"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Angemeldet"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Verbinde"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "_Abwesend"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "Hat Fehler"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "An"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Von"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "Keine:"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Keine"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Besitzer"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrator"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Mitglied"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "schreibt im Moment ..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:334
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "schreibt im Moment nicht mehr ..."
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
+#: ../src/common/helpers.py:871
+#, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] " %d ungelesene Nachricht"
+msgstr[1] " %d ungelesene Nachrichten"
+
+#: ../src/common/helpers.py:877
+#, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] " %d ungelesene Einzel-Nachricht"
+msgstr[1] " %d ungelesene Einzel-Nachrichten"
+
+#: ../src/common/helpers.py:883
+#, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] " %d ungelesene Gruppenchat-Nachricht"
+msgstr[1] " %d ungelesene Gruppenchat-Nachrichten"
+
+#: ../src/common/helpers.py:889
+#, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] " %d ungelesene private Nachricht"
+msgstr[1] " %d ungelesene private Nachrichten"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
-#: ../src/common/optparser.py:174
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:183 ../src/common/optparser.py:184
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "cyan"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "Erstelle Log-Datenbank"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "für Konto %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Konnte Bild nicht laden"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Konnte nicht mit %s verbinden"
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Diese Nachricht ist verschlüsselt]"
+
+#~ msgid "Create your own Privacy Lists"
+#~ msgstr "Erstelle eigene Privatliste"
+
+#~ msgid "Server-based Privacy Lists"
+#~ msgstr "Server-basierte Privatliste"
+
+#~ msgid "Contact _Info"
+#~ msgstr "Kontakt-_Info"
+
+#~ msgid "New Room"
+#~ msgstr "Neuer Raum"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber-ID"
+
+#~ msgid "User ID"
+#~ msgstr "Benutzer-ID"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Ungültiger Raum oder Servername"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Unbekannte D-BUS-Version: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "vCard erfolgreich veröffentlicht"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Ihre persönlichen Informationen wurden erfolgreich veröffentlicht."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Neuen Raum betreten"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Versteckt dieses Menü"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d ungelesene Nachricht"
+#~ msgstr[1] "Gajim - %d ungelesene Nachrichten"
+
+#~ msgid "Since %s"
+#~ msgstr "Seit %s"
+
+#~ msgid "Personal details"
+#~ msgstr "Persönliche Details"
+
+#~ msgid "Be right back"
+#~ msgstr "Bin gleich zurück"
+
 #, fuzzy
 #~ msgid "_Account:"
 #~ msgstr "Konto:"
@@ -5811,15 +6422,9 @@ msgstr "cyan"
 #~ msgid "Contact Information"
 #~ msgstr "Kontakt-Information"
 
-#~ msgid "Format: YYYY-MM-DD"
-#~ msgstr "Format: JJJJ-MM-TT"
-
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
 
-#~ msgid "Set _Avatar"
-#~ msgstr "_Avatar wählen"
-
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migriere Logs..."
 
@@ -6035,9 +6640,6 @@ msgstr "cyan"
 #~ msgid "Session bus is not available."
 #~ msgstr "Session-Bus nicht verfügbar."
 
-#~ msgid "with account %s"
-#~ msgstr "für Konto %s"
-
 #~ msgid "with account "
 #~ msgstr "Konto: "
 
@@ -6204,9 +6806,6 @@ msgstr "cyan"
 #~ msgid "Click to get contact's extended information"
 #~ msgstr "Klicken, um erweiterte Informationen des Kontaktes einzusehen"
 
-#~ msgid "Enter your message:"
-#~ msgstr "Geben Sie ihre Nachricht ein:"
-
 #~ msgid "_Compact View"
 #~ msgstr "_Kompakte Ansicht"
 
@@ -6261,9 +6860,6 @@ msgstr "cyan"
 #~ msgid "Show roster window on Gajim startup"
 #~ msgstr "Kontaktliste beim Start von Gajim anzeigen"
 
-#~ msgid "_Join Group Chat"
-#~ msgstr "_Chatraum betreten"
-
 #~ msgid "_Service Discovery"
 #~ msgstr "_Dienste durchsuchen"
 
diff --git a/po/el.po b/po/el.po
index 4c1284826..57bc967f6 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,12 +7,12 @@
 # Filippos Papadopoulos <filip@cs.uoi.gr>, 2005.
 # Stathis Kamperis <ekamperi@auth.gr>, 2005
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-04-19 18:47+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Hellenic-Ελληνικά-Greek\n"
@@ -24,15 +24,15 @@ msgstr ""
 "X-Poedit-Language: Greek\n"
 "X-Poedit-Country: GREECE\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Gajim Instant Messenger"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Ένα πρόγραμμα για το Jabber"
 
@@ -49,16 +49,23 @@ msgid "_Discover Services..."
 msgstr "Εύρεση _Υπηρεσιών..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Ομαδική συζήτηση"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Επεξεργασία λογαριασμού..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Άνοιγμα προγράμματος αλληλογραφίας"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Κατάσταση"
 
@@ -113,7 +120,7 @@ msgid "Pass_word:"
 msgstr "_Κωδικός:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "_Αποθήκευση"
 
@@ -138,7 +145,7 @@ msgid "Your JID:"
 msgstr "Το JID σας:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "Για προ_χωρημένους"
 
@@ -152,7 +159,7 @@ msgid "_Host:"
 msgstr "_Ξένος υπολογιστής:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Κωδικός:"
 
@@ -184,10 +191,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Διάφορα</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Προσωπικές πληροφορίες</b>"
 
@@ -204,6 +213,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Αυτόματη επανασύνδεση κατά την απώλεια της σύνδεσης"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
 
@@ -224,6 +234,7 @@ msgstr ""
 "διακομιστή, και ότι με αυτή την επιλογή απενεργοποιείτε το TLS"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Επιλογή _κλειδιού..."
 
@@ -240,16 +251,16 @@ msgid "Edit Personal Information..."
 msgstr "Τροποποίηση προσωπικών πληροφοριών..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Γενικά"
 
@@ -276,6 +287,7 @@ msgstr ""
 "διακοπή της σύνδεσης"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -284,6 +296,7 @@ msgstr ""
 "δικαίωμα ανάγνωσης μόνο για εσάς"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -292,6 +305,7 @@ msgstr ""
 "χρησιμοποιώντας αυτόν το λογαριασμό"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -309,18 +323,23 @@ msgstr "Οι πληροφορίες για εσάς αποθηκεύονται �
 msgid "Manage..."
 msgstr "Διαχείριση..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Καμία επιλογή κλειδιού"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Τίποτα"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Προσωπικές πληροφορίες"
 
@@ -344,14 +363,18 @@ msgstr ""
 "μεγαλύτερη προτεραιότητα λαμβάνει τα γεγονότα"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Μεσολαβητής:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "_Πόρος: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -366,40 +389,46 @@ msgstr ""
 "ίδια στιγμή. Ο πόρος με τη μεγαλύτερη προτεραιότητα θα λαμβάνει τα γεγονότα. "
 "(βλέπε και πιο κάτω)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Αποθήκευση _κωδικοφράσης (περιορισμένη ασφάλεια)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Αποθήκευση ιστορι_κού συνομιλιών για όλες τις επαφές"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Αποστολή πακέτων keep-alive"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Χρήση _SSL (για λόγους συμβατότητας)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Χρήση μεσολαβητών μεταφοράς αρχείων"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Όνομα: "
 
@@ -409,62 +438,91 @@ msgstr "Λογαριασμοί"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Αν έχετε 2 ή περισσότερους λογαριασμούς και έχει επιλεγεί, το Gajim θα "
 "εμφανίζει τις επαφές σας σαν να είχατε ένα λογαριασμό"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Συνένωση λογαριασμών"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Τροποποίηση"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Λογαριασμός:"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Επίτρεψε τον/την να βλέπει την κατάστασή μου"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Προσθήκη νέας επαφής"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Λογαριασμός:"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Ομάδα:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 msgid "_Nickname:"
 msgstr "_Όνομα χρήστη:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Πρωτόκολλο:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
 msgstr "_Εγγραφή"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "Ταυτότητα χρήστη:"
@@ -557,82 +615,63 @@ msgstr "<b>Ήχοι</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Διεύθυνση"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "Ενέργειες για Προ_χωρημένους"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Κατάσταση: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Απομακρυσμένος"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Απασχολημένος"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Λήψη"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Αφανής"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "εντολή"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -645,75 +684,75 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Χρήση ενός παραθύρου κουβέντας με _καρτέλες"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Εμφά_νισε το μόνο στο κύριο παράθυρο"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Εμφά_νισε το μόνο στο κύριο παράθυρο"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Θύρα: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -748,7 +787,7 @@ msgstr "Συμμετοχή σε _Ομαδική συζήτηση"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Προσθήκη στη λίστα επαφών"
 
@@ -769,7 +808,8 @@ msgid "_Open Link in Browser"
 msgstr "_Άνοιγμα δεσμού σε περιηγητή"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Έναρξη κουβέντας"
@@ -779,7 +819,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις με αυτή την επαφή"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Αποστολή _αρχείου"
 
@@ -795,7 +836,8 @@ msgstr "_Συμπαγής όψη   Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Ιστορικό"
 
@@ -861,7 +903,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Συνέχεια"
 
@@ -898,39 +940,34 @@ msgstr ""
 "Banner"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Ενεργοποιημένο"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Έντονα"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Σύνθεση"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Γραμματοσειρά:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Προσαρμογή θεμάτων Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Έξω"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Ανενεργό"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Πλάγια"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -938,7 +975,7 @@ msgstr ""
 "MUC\n"
 "Μηνύματα"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -946,19 +983,19 @@ msgstr ""
 "Μηνύματα προς\n"
 "ομαδικές κουβέντες"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Παύση"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "Χρώμα _κειμένου:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "Γρα_μματοσειρά κειμένου:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "Χρώμα _φόντου:"
 
@@ -1079,7 +1116,7 @@ msgid "Accept"
 msgstr "Αποδοχή"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Άρνηση"
 
@@ -1087,13 +1124,14 @@ msgstr "Άρνηση"
 msgid "Invitation Received"
 msgstr "Παραλήφθηκε μια πρόσκληση"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε Ομαδική συζήτηση"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Όνομα χρήστη:"
 
@@ -1111,13 +1149,8 @@ msgstr "Πρόσφατα:"
 msgid "Room:"
 msgstr "Δωμάτιο:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Διακομιστής:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
@@ -1144,6 +1177,10 @@ msgstr "Διαχείριση σελιδοδεικτών"
 msgid "Print status:"
 msgstr "Εμφάνιση χρόνου:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Διακομιστής:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Τίτλος:"
@@ -1165,7 +1202,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Διαχείριση προφίλ μεσολαβητή"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Όνομα:"
 
@@ -1181,20 +1219,21 @@ msgstr "Χρήση πιστοποίησης"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "Κρυπτογράφηση OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Ενέργειες"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Αποστολή"
 
@@ -1269,18 +1308,25 @@ msgid "Also known as iChat style"
 msgstr "Επίσης γνωστό ως στυλ iChat"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Ερώτηση μηνύματος κατάστασης όταν γίνομαι:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Αυτόματα _απομακρυσμένος μετά:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1292,19 +1338,19 @@ msgstr ""
 "Πάντα χρήση των προεπιλεγμένων εφαρμογών του KDE\n"
 "Προσαρμοσμένες ρυθμίσεις"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "Π_ριν το ψευδώνυμο:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Κουβέντα"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1314,35 +1360,40 @@ msgstr ""
 "ή άλλα ενοχλητικά μηνύματα. Χρησιμοποιήστε το με προσοχή, γιατί μπλοκάρει "
 "όλα τα μηνύματα από κάθε επαφή που δεν έχετε στη λίστα επαφών σας"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Μήνυμα κατάστασης"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "Εξορισμού _σετ εικονιδίων κατάστασης:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "Κάθε 5 _λεπτά"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Φατσούλες:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Γεγονότα"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1352,13 +1403,13 @@ msgstr ""
 "μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
 "θέλετε να στέλνετε στους άλλους."
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Το Gajim θα εμφανίσει αυτόματα νέα γεγονότα αναδύοντας το ανάλογο παράθυρο"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1366,7 +1417,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει για το νέο μήνυμα μέσω ενός αναδυόμενου "
 "παραθύρου στο κάτω δεξιά μέρος της οθόνης"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1374,7 +1425,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις συνδέθηκαν στο Jabber"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1382,13 +1433,19 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Το Gajim θα αλλάξει μόνο το εικονίδιο της επαφής που προκάλεσε το νέο γεγονός"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1396,7 +1453,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1404,7 +1461,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
 "κάτω από τα ονόματα τους στη λίστα επαφών και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1412,7 +1469,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα θυμάται την θέση και το μέγεθος του κύριου "
 "παραθύρου την επόμενη φορά που θα εκτελεστεί"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1422,7 +1479,7 @@ msgstr ""
 "πρωτόκολλο της επαφής. (πχ. Μια επαφή από το MSN θα έχει το αντίστοιχο msn "
 "εικονίδιο για τις καταστάσεις διαθέσιμος, απομακρυσμένος κλπ..)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1430,11 +1487,11 @@ msgstr ""
 "Αν δεν απενεργοποιηθεί, το Gajim θα μετατρέπει όλα ascii σύμβολα όπως το "
 "':)' με τις αντίστοιχες γραφικές φατσούλες"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "Δια_χείριση..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1446,82 +1503,86 @@ msgstr ""
 "Ανά λογαριασμό\n"
 "Ανά τύπο"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Ειδοποίηση σε νέο μήνυμα στο _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "Παρά_θυρο ενός μηνύματος:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Εμφάνιση χρόνου:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Αποθήκευση _θέσης και μεγέθους για τη λίστα επαφών και για τα παράθυρα "
 "κουβέντας"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Εμφά_νισε το μόνο στο κύριο παράθυρο"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "Σύν_δεση"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "Αποσ_ύνδεση"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "_Θέμα:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Αυτόματο μήνυμα για κατάσταση απομακρυσμένος"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Αυτόματο μήνυμα για κατάσταση μη διαθέσιμος"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1533,151 +1594,160 @@ msgstr ""
 "Συμβάντα για νέα μηνύματα δημιουργούνται μόνο όταν λαμβάνονται μηνύματα από "
 "επαφές με τις οποίες δεν κουβεντιάζετε ήδη"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "Μετά α_πό χρόνο:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "_Πριν από χρόνο:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Περιηγητής:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "_Διαχειριστής αρχείων:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Γραμματοσειρά:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Αγνόησε γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "_Εισερχόμενο μήνυμα:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Εφαρμογή αλληλογραφίας:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Ποτέ"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Ειδοποίησε με για αυτό"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Άνοιγμα..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "Ε_ξερχόμενο μήνυμα:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Αναπαραγωγέας:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Εμφάνισε το"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "Μήνυμα κατά_στασης:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "Διεύ_θυνση:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "λεπτά"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Προσωπικές συζητήσεις"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Μορφή μια γραμμής κουβέντας</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Διαγραφή"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Διακομιστής:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Λίστα Ban"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Εγγραφή"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "Στην ομάδα"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1685,32 +1755,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Αποστολή μηνύματος"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Ζήτα να βλέπεις την κατάσταση του/της"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Επίτρεψε τον/την να βλέπει την κατάστασή μου"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Περί"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Διεύθυνση"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Κα_θορισμός Avatar"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Γενέθλια:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Πόλη:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Εταιρία:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Χώρα:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Τμήμα"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Ε-Mail:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Επιπλέον οδός:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Οικογένεια:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Δοθέν όνομα"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Προσωπ. σελίδα:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Μέσο:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Περισσότερα"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Προσωπικές Πληροφορίες"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Τηλέφωνο:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Θέση:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Τ.Κ.:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Πρόθεμα:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Ρόλος:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Νομός:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Οδός:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Κατάληξη:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Δουλειά"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Δημοσιοποίηση"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Ανάκτηση"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1730,47 +1940,58 @@ msgid "A_sk to see his/her status"
 msgstr "Ζήτα να βλέπεις την κατάσταση του/της"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Προσθήκη ειδικής γνωστοποίησης"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Ανάθεση Open_PGP κλειδιού"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Επεξεργασία _ομάδων"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Αποστολή ενός _μηνύματος"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Έναρξη _συζήτησης"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Επίτρεψε τον/την να βλέπει την κατάστασή μου"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Απαγόρευσε τον/την να βλέπει την κατάστασή μου"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "Α_φαίρεση από τη Λίστα επαφών"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Εγγραφή"
 
@@ -1795,42 +2016,53 @@ msgid "Help online"
 msgstr "Online βοήθεια"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Προφίλ, Avatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Μεταφορές"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "Εύρεση _υπηρεσιών"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_Συχνές ερωτήσεις"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Προτιμήσεις"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Έξοδος"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Φωνή"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "Πάμ_ε"
@@ -1901,24 +2133,20 @@ msgstr ""
 "Εξουσιοδοτήστε μια επαφή ώστε να μπορεί να ξέρει πότε είστε συνδεδεμένος"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "Πλη_ροφορίες επαφής"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Αρνηθείτε εξουσιοδότηση σε μια επαφή ώστε να μη μπορεί να γνωρίζει πότε "
 "είστε συνδεδεμένος"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Αίτηση εγγραφής"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Εξουσιοδότηση"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Άρνηση"
 
@@ -1934,164 +2162,51 @@ msgstr "Εμφάνιση _λίστας επαφών"
 msgid "Sta_tus"
 msgstr "Κατάσ_ταση"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Περί"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Διεύθυνση"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Ζητείται:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Γενέθλια:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Πόλη:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Εφαρμογή:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Εταιρία:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Πληροφορίες επαφής"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Χώρα:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Τμήμα"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "Ε-Mail:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Επιπλέον οδός:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Οικογένεια:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Δοθέν όνομα"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Προσωπ. σελίδα:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Επαφές"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Περιοχή"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Μέσο:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Περισσότερα"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "Λειτ. Σύστημα:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Τηλέφωνο:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Θέση:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Τ.Κ.:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Πρόθεμα:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Πόρος:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Ρόλος:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Κα_θορισμός Avatar"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Νομός:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Οδός:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Εγγραφή:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Κατάληξη:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Δουλειά"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Καταγραφή ιστορικού κουβέντας"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Δημοσιοποίηση"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Ανάκτηση"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Κίνηση Jabber</b>"
@@ -2123,30 +2238,165 @@ msgstr "_Μήνυμα"
 msgid "_Presence"
 msgstr "_Παρουσία"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Όνομα:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Όνομα:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Προσωπικές Πληροφορίες"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Επεξεργασία λογαριασμού..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Όνομα προτίμησης"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Τιμή"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Είδος"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Κενή)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Μυστικό"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Γενικά"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "πράσινο"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Περιοχή"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Πλάγια"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Δημοσιοποίηση"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2162,53 +2412,63 @@ msgstr ""
 "\n"
 "Η υπογράμμιση τυπογραφικών λαθών απενεργοποιήθηκε"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Κουβέντες"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s: %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "Ο/η %s δεν έχει στείλει ένα κλειδί OpenPGP ούτε εσείς έχετε εφαρμόσει κάποιο"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "εκτός λίστας επαφών"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2216,82 +2476,98 @@ msgstr ""
 "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 "μήνυμα θα χαθεί."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Κάθε %s _λεπτά"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Ενεργοποιημένο"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Λήφθηκε το πρώτο μήνυμα"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Επισήμανση "
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής κουβέντας"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Αδιάβαστα γεγονότα"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να διαβάσετε όλα τα εκκρεμή "
 "γεγονότα."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2299,153 +2575,184 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δε μπορεί να έχει κενά."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Μη έγκυρη καταχώρηση"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Νέα είσοδος τώρα;"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
 "συνδεθείτε ξανά."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr ""
+"Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
+"τροποποιείτε τις προσωπικές σας πληροφορίες."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Σφάλμα κατά τη λήψη του OpenPGP μυστικών κλειδιών σας."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το OpenPGP κλειδί σας"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Διακομιστής"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Ανάγνωση όλων των γενονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Λίστα Ban"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Λίστα μελών"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Λίστα ιδιοκτητών"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Λίστα διαχειριστών"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Αιτία"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Ρόλος"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Απαγορεύεται η πρόσβαση..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2453,11 +2760,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να αποβάλλετε;</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Προσθήκη μέλους..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2465,11 +2772,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε μέλος;</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Προσθήκη ιδιοκτήτη..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2477,11 +2784,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε ιδιοκτήτη;</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Προσθήκη διαχειριστή..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2489,7 +2796,7 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε διαχειριστή;</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2505,91 +2812,92 @@ msgstr ""
 "4. τομέας (ταιριάζει ο τομέας, και κάθε χρήστης@τομέας,\n"
 "τομέας/πόρος, ή διεύθυνση που περιέχει υποτομέα."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Νέο δωμάτιο"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Ομαδική συζήτηση"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε το σελιδοδείκτη."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Διπλότυπο αναγνωριστικό Jabber"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Αυτός ο λογαριασμός έχει ήδη στηθεί στο Gajim."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2598,23 +2906,23 @@ msgstr ""
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2622,175 +2930,196 @@ msgstr ""
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Ενέργειες για \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Λείπει ένα \"%s\" από το URL του λεξικού και δεν είναι WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής αναζήτησης"
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Χθες"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "πριν από %i μέρες"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "Δεν υπάρχει υποστήριξη D-Bus για την python σε αυτόν τον υπολογιστή"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Οι δυνατότητες του Gajim για D-Bus δε θα χρησιμοποιηθούν"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Όνομα επαφής: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "Στην ομάδα"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "Ταυτότητα κλειδιού"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Όνομα επαφής"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "Μήνυμα για κατάσταση %s"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Αποθήκευση ως προκαθορισμένο μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Εισάγετε ένα όνομα για αυτό το μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Διεύθυνση:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Διεύθυνση:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Επιπλέον οδός:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στο "
 "λογαριασμό %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Μεταφορές"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Μη έγκυρη ταυτότητα χρήστη"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "Το αναγνωριστικό χρήστη δεν πρέπει να περιέχει έναν πόρο."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Αυτή η επαφή υπάρχει ήδη στη λίστα επαφών σας."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "Ταυτότητα χρήστη:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "ΕΥΧΑΡΙΣΤΙΕΣ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Τέλος, θα θέλαμε να ευχαριστήσουμε όλους τους διαχειριστές πακέτων."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
@@ -2798,295 +3127,325 @@ msgstr ""
 "Σταύρος Γιαννούρης <stavrosg2002@freemail.gr>\n"
 "Στάθης Καμπέρης <ekamperi@auth.gr>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Αίτηση εγγραφής για το λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική συζήτηση με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Μη έγκυρο δωμάτιο ή όνομα διακομιστή"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Έναρξη κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Συμπληρώστε την ταυτότητα της επαφής προς την οποία\n"
 "θέλετε να στείλετε ένα μήνυμα συζήτησης:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Αδύνατη η εγγραφή αρχείου στο %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Νέο μήνυμα"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Νέο μονό μήνυμα"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Αποσύνδεση επαφής"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
+msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
+
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Μονό μήνυμα"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Έγινε λήψη του %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Περιγραφή: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Προσαρμοσμένες Ρυθμίσεις</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Προσαρμοσμένες Ρυθμίσεις</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Επιλογή ήχου"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Αρχεία ήχου Wav"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Επιλογή εικόνας"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Όταν το %s γίνεται:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Σύνδεση"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Άλλα"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ανακάλυψη υπηρεσιών χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Ανακάλυψη υπηρεσιών"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3094,46 +3453,51 @@ msgstr ""
 "Δεν υπάρχει υπηρεσία στη διεύθυνση που εισάγατε, ή δεν ανταποκρίνεται. "
 "Ελέγξτε τη διεύθυνση και προσπαθήστε ξανά."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Η υπηρεσία δεν είναι περιηγήσιμη"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Αυτού του είδους η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Περιήγηση %s χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Περιήγηση"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Σάρωση %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Χρήστες"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Περιγραφή"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Αρχείο"
@@ -3151,7 +3515,7 @@ msgstr "Πρόοδος"
 msgid "Filename: %s"
 msgstr "Όνομα αρχείου: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Mέγεθος: %s"
@@ -3159,17 +3523,17 @@ msgstr "Mέγεθος: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
@@ -3190,78 +3554,88 @@ msgstr "Η μεταφορά αρχείου ακυρώθηκε"
 msgid "Connection with peer cannot be established."
 msgstr "Η σύνδεση με τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Παραλήπτης: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Πληκτρολογήστε το μήνυμα σας:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Η μεταφορά αρχείου σταμάτησε από την επαφή της άλλης πλευράς"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Το Gajim δεν έχει πρόσβαση σε αυτό το αρχείο"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Αυτό το αρχείο χρησιμοποιείται από άλλη διεργασία."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Αρχείο: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Αποθήκευση αρχείου ως..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3269,58 +3643,260 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/δεπτ)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Αρχείο:"
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Το Gajim απαιτεί Xserver για να εκτελεστεί. Έξοδος..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "Η libglade λείπει από το GTK+"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Παρακαλώ απεγκαταστήστε την τρέχουσα έκοδση του GTK+ και εγκαταστήστε την "
+"τελευταία σταθερή έκδοση από %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Παρακαλώ βεβαιωθείτε ότι το GTK+ και το PyGTK του συστήματος σας έχουν "
+"υποστήριξη για την libglade."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Το Gajim χρειάζεται την PySQLite2 για να εκτελεστεί"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Το Gajim χρειάζεται την PySQLite2 για να εκτελεστεί"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Δέχεστε αυτό το αίτημα;"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Σύνδεση"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Θέμα: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Λήψη εξουσιοδότησης"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Θα βλέπετε την επαφή πάντα ως αποσυνδεδεμένη."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "Ο %s είναι τώρα %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "H κωδική φράση είναι λανθασμένη"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Έχετε %d νέο μήνυμα ηλεκτρονικής αλληλογραφίας"
+msgstr[1] "Έχετε %d νέα μηνύματα ηλεκτρονικής αλληλογραφίας"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Η υποστήριξη για Διαχείριση συνόδων δεν είναι διαθέσιμη (δεν υπάρχει το "
+"άρθρωμα του gnome.ui)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "εμφανίζει βοήθεια για μια συγκεκριμένη εντολή"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "εντολή"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "εμφάνιση βοήθειας στην εντολή"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3328,48 +3904,48 @@ msgstr ""
 "Εμφανίζει όλες τις επαφές στη λίστα επαφών. Κάθε επαφή εμφανίζεται σε μια "
 "ξεχωριστή γραμμή"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "λογαριασμός"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "εμφάνιση μόνο των επαφών του συγκεκριμένου λογαριασμού"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Εμφανίζει τη λίστα των καταχωρημένων λογαριασμών"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "κατάσταση"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
 "εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "μήνυμα"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "μήνυμα κατάστασης"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3378,23 +3954,23 @@ msgstr ""
 "δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Εμφανίζει το διαλόγο κουβέντας ώστε να μπορείτε να στέλνετε μηνύματα σε μια "
 "επαφή"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "εάν έχει καθοριστεί, η επαφή λαμβάνεται από την λίστα επαφών αυτού του "
 "λογαριασμού"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3406,29 +3982,29 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "περιεχόμενα μηνύματος"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "κλειδί pgp"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "εάν καθοριστεί, το μήνυμα θα κρυπτογραφηθεί χρησιμοποιώντας αυτό το δημόσιο "
 "κλειδί"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "εάν οριστεί, το μήνυμα θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3440,132 +4016,147 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Θέμα"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Λήψη αναλυτικών πληροφοριών για μία επαφή"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "το JID της επαφής"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Λήψη αναλυτικών πληροφοριών για ένα λογαριασμό"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Όνομα λογαριασμού"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "αρχείο"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "εάν οριστεί, το αρχείο θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Εμφανίζει όλες τις προτιμήσεις και τις τιμές τους"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Καταχωρεί την 'τιμή' στην τιμή του 'κλειδιού'"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "κλειδί=τιμή"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "Το 'κλειδί' είναι το όνομα της προτίμησης, ενώ 'τιμή' είναι η τιμή που του "
 "έχει προσδιοριστεί"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Διαγράφει μια προτίμηση"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "κλειδί"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "όνομα της προτίμησης που πρόκειται να διαγραφεί"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Προσθέτει μια επαφή σε αυτό το λογαριασμό."
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Αναφέρει τον αριθμό των μη αναγνωσμένων μηνυμάτων"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Έναρξη κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "XML Κονσόλα"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3574,16 +4165,11 @@ msgstr ""
 "Η επαφή '%s' δεν είναι στη λίστα σας.\n"
 "Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Άγνωστη έκδοση του D-Bus: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3592,16 +4178,16 @@ msgstr ""
 "Χρήση: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Ορίσματα:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "μη υπαρκτό %s"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3610,7 +4196,7 @@ msgstr ""
 "Χρήση: %s εντολή [ορίσματα]\n"
 "Η εντολή είναι μία από τις:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3619,332 +4205,135 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Το Gajim απαιτεί Xserver για να εκτελεστεί. Έξοδος..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Η libglade λείπει από το GTK+"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Παρακαλώ απεγκαταστήστε την τρέχουσα έκοδση του GTK+ και εγκαταστήστε την "
-"τελευταία σταθερή έκδοση από %s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Παρακαλώ βεβαιωθείτε ότι το GTK+ και το PyGTK του συστήματος σας έχουν "
-"υποστήριξη για την libglade."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Το Gajim χρειάζεται την PySQLite2 για να εκτελεστεί"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Δέχεστε αυτό το αίτημα;"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Λήψη εξουσιοδότησης"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Θα βλέπετε την επαφή πάντα ως αποσυνδεδεμένη."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "Ο %s είναι τώρα %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "H κωδική φράση είναι λανθασμένη"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Έχετε %d νέο μήνυμα ηλεκτρονικής αλληλογραφίας"
-msgstr[1] "Έχετε %d νέα μηνύματα ηλεκτρονικής αλληλογραφίας"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Οι προσωπικές σας πληροφορίες δημοσιοποιήθηκαν με επιτυχία."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "Η δημοσιοποίηση της vCard απέτυχε"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
-"δοκιμάστε αργότερα."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Η υποστήριξη για Διαχείριση συνόδων δεν είναι διαθέσιμη (δεν υπάρχει το "
-"άρθρωμα του gnome.ui)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Μεταφορά ιστορικού..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Θέμα"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "όνομα θέματος"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντος θέματος"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Προσωπική συζήτηση"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Ομαδική συζήτηση"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Αλλαγή _ψευδώνυμου"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "Ο %s είναι τώρα %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Προσκαλέσατε τον/την %(contact_jid)s στο %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "Το %s δεν φαίνεται να είναι έγκυρο JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Δεν βρέθηκε η εντολή: /%s (εάν θέλετε να το πείτε αυτό βάλτε το /say μπροστά)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Εντολές: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3957,7 +4346,7 @@ msgstr ""
 "Εάν το JID είναι στο δωμάτιο, ο χρήστης θα πεταχτεί έξω επίσης. ΔΕΝ "
 "υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3965,12 +4354,12 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
 "συγκεκριμένο χρήστη."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3979,12 +4368,12 @@ msgstr ""
 "Χρήση: /%s [λόγος], κλείνει το τρέχον παράθυρο ή καρτέλα, ανακοινώνοντας το "
 "λόγο εάν έχει προσδιοριστεί."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3993,7 +4382,7 @@ msgstr ""
 "Χρήση: /%s <JID> [λόγος], προσκαλεί το JID στο τρέχον δωμάτιο, παρέχοντας "
 "προαιρετικά και λόγο."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4002,7 +4391,7 @@ msgstr ""
 "Χρήση: /%s <δωμάτιο>@<διακομιστής>[/ψευδώνυμο], επιδιώκει την είσοδο στο "
 "δωμάτιο@διακομιστή, προαιρετικά χρησιμοποιώντας το ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4012,7 +4401,7 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο> [αιτία], βγάζει τον χρήστη που προσδιορίστηκε από το "
 "δωμάτιο, προσδιορίζοντας την αιτία. ΔΕΝ υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -4021,7 +4410,7 @@ msgstr ""
 "Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
 "προσώπου (π.χ. /%s χοροπηδάει)."
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4030,22 +4419,22 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο> [μήνυμα], ανοίγει ένα παράθυρο προσωπικού διαλόγου "
 "και στέλνει το μήνυμα στο χρήστη που προσδιορίστηκε."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4053,80 +4442,80 @@ msgstr ""
 "Χρήση: /%s <μήνυμα>, στέλνει ένα μήνυμα χωρίς να γίνει έλεγχος για άλλες "
 "εντολές."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Δεν υπάρχουν πληροφορίες για το /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "Μη_ν με ξαναρωτήσεις"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
 "κεντρικό παράθυρο."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Εντοπίστηκε ένα προγραμματιστικό σφάλμα"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4134,83 +4523,83 @@ msgstr ""
 "Πιθανότατα δεν είναι κρίσιμο, αλλά πρέπει να αναφερθεί στους προγραμματιστές "
 "σε κάθε περίπτωση."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Αναφορά σφάλματος"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "<b>Λεπτομέρειες</b>"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Σφάλμα κατά την ανάλυση του αρχείου:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Αδυναμία εγγραφής στο %s. Δε θα υπάρξει υποστήριξη για το διαχειριστή "
 "συνεδριών"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Αποθήκευση αρχείου ως..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Δεν ήταν δυνατή η εύρεση της βάσης δεδομένων ιστορικού"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Επαφές"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Ημερομηνία"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Όνομα χρήστη"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Μήνυμα"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Θέμα"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4218,7 +4607,7 @@ msgstr ""
 "Θέλετε να καθαρίσετε τη βάση δεδομένων; (ΑΝΤΕΝΔΕΙΚΝΥΤΑΙ ΙΣΧΥΡΑ ΕΑΝ ΤΟ GAJIM "
 "ΤΡΕΧΕΙ)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4232,20 +4621,16 @@ msgstr ""
 "\n"
 "Σε περίπτωση που επιλέξατε ΝΑΙ, παρακαλώ περιμένετε..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Εξαγωγή ιστορικού..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "Ο %(who)s είπε στις %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "ποιος"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
@@ -4253,112 +4638,161 @@ msgstr[0] ""
 msgstr[1] ""
 "Θέλετε σίγουρα να διαγράψετε τα αρχεία καταγραφής των επιλεγμένων επαφών;"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Αυτή η ενέργεια δεν είναι αναστρέψιμη."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 msgstr[1] "Θέλετε σίγουρα να διαγράψετε τα επιλεγμένα μηνύματα;"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Ιστορικό κουβέντας με τον %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "Ο/Η %(nick)s είναι τώρα %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Σύνδεση %(nickname)s"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Αποσύνδεση %(nickname)s"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Νέο μονό μήνυμα από %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Νέο προσωπικό μήνυμα από το δωμάτιο %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Παραλήφθηκε μια πρόσκληση"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr ""
+"Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
+"σας"
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "Η δημοσιοποίηση της vCard απέτυχε"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
+"δοκιμάστε αργότερα."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr ""
+"Πρέπει να είστε συνδεδεμένος για να λάβετε τις πληροφορίες της επαφής σας"
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Παρατηρητές"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "στο λογαριασμό %s"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
@@ -4366,41 +4800,55 @@ msgstr "χρήση του λογαριασμού %s"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Διαχείριση σελιδοδεικτών..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "για το λογαριασμό %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Σύνδεση σε νέο δωμάτιο"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "_Είσοδος σε Ομαδική Συζήτηση"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr ""
+"Ανάγνωση όλων των γενονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
+"λογαριασμού."
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4408,68 +4856,87 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
+"μεταφορά."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Νέο δωμάτιο"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "_Μετονομασία"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Σύνδεση"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "_Αποσύνδεση"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: ../src/roster_window.py:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4477,7 +4944,7 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4485,36 +4952,51 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2334
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
-#: ../src/roster_window.py:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
+"συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Απαιτείται κωδικοφράση"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Πληκτρολογήστε την κωδικοφράση GPG για το λογαριασμό %s"
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Αποθήκευση της κωδικοφράσης"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Εσφαλμένη κωδικοφράση"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Παρακαλώ εισάγετε ξανά την κωδική φράση GPG σας, ή επιλέξτε Ακύρωση."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4522,21 +5004,22 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4544,145 +5027,111 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Αφαίρεση %s από την ομάδα %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Αλλαγή μηνύματος κατάστασης..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "Αλλαγή μηνύματος _κατάστασης..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Απόκρυψη αυτού του μενού"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d μη αναγνωσμένο μήνυμα"
-msgstr[1] "Gajim - %d μη αναγνωσμένα μηνύματα"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d μη αναγνωσμένο μήνυμα"
-msgstr[1] "Gajim - %d μη αναγνωσμένα μηνύματα"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d μη αναγνωσμένο μεμονωμένο μήνυμα"
-msgstr[1] "Gajim - %d μη αναγνωσμένα μεμονωμένα μηνύματα"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d μη αναγνωσμένο μήνυμα"
-msgstr[1] "Gajim - %d μη αναγνωσμένα μηνύματα"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d μη αναγνωσμένο προσωπικό μήνυμα"
-msgstr[1] "Gajim - %d μη αναγνωσμένα προσωπικά μηνύματα"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Ρόλος: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Συσχέτιση: "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Πόρος: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Κατάσταση: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Εγγραφή: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Κατάσταση: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Τελευταία κατάσταση στο %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Από τις %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "από τις %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Λήψη"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Τύπος: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Μεταφέρθηκαν: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Δεν έχει ξεκινήσει"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Πάγωσε"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Μεταφέρεται"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Αυτή η υπηρεσία δεν έχει απαντήσει ακόμα με λεπτομερείς πληροφορίες"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4690,25 +5139,25 @@ msgstr ""
 "Αυτή η υπηρεσία δεν μπόρεσε να απαντήσει με λεπτομερείς πληροφορίες.\n"
 "Είναι είτε χαλασμένη είτε πεπαλαιωμένη."
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "?Λειτ. Σύστημα: Άγνωστο"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "από τις %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Συσχέτιση: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4716,7 +5165,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4724,12 +5173,12 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
 #. None
-#: ../src/vcard.py:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4737,30 +5186,15 @@ msgstr ""
 "Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η "
 "ενδιαφέρεται για εσάς"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: ../src/vcard.py:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
-#: ../src/vcard.py:458
-msgid "Without a connection you can not publish your contact information."
-msgstr ""
-"Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
-"σας"
-
-#: ../src/vcard.py:491
-msgid "Without a connection, you can not get your contact information."
-msgstr ""
-"Πρέπει να είστε συνδεδεμένος για να λάβετε τις πληροφορίες της επαφής σας"
-
-#: ../src/vcard.py:495
-msgid "Personal details"
-msgstr "Προσωπικές πληροφορίες"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
@@ -4785,99 +5219,92 @@ msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να ε
 msgid "creating %s directory"
 msgstr "δημιουργία φακέλου %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "Δεν βρέθηκε το pysqlite2 (ή python-pysqlite2). Έξοδος..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Μη διαθέσιμη υπηρεσία: Το Gajim δεν τρέχει ή δεν είναι ενεργοποιημένο το "
-"remote_control"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr ""
-"Δεν υπάρχει D-Bus διαθέσιμο σε αυτό το μηχάνημα ή το άρθρωμα της python "
-"λείπει"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Ο δίαυλος μηνυμάτων δεν είναι διαθέσιμος.\n"
-"Παρακαλώ συμβουλευτείτε το http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Χρήση του D-Bus και του δαίμονα ειδοποιήσεων για εμφάνιση ειδοποιήσεων"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε "
 "απομακρυσμένος."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Απομακρυσμένος λόγω αδράνειας"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε μη "
 "διαθέσιμος."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Μη διαθέσιμος λόγω αδράνειας"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:88
+msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Τα ζεύγη * / _ είναι χαρακτήρες μορφοποίησης."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Αν είναι αληθές, μην αφαιρείς */_. Έτσι το *αβγ* θα είναι μεν έντονο αλλά τα "
 "* * δεν θα αφαιρεθούν."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Να προστεθεί * και [n] στον τίτλο της λίστας επαφών;"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4885,12 +5312,12 @@ msgstr ""
 "Πόσες γραμμές από την προηγούμενη συζήτηση θα εμφανίζονται όταν θα "
 "ξανανοίξει μια καρτέλα/παράθυρο κουβέντας."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Πόσα λεπτά θα παραμείνουν οι τελευταίες γραμμές από την προηγούμενη συζήτηση."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4898,11 +5325,11 @@ msgstr ""
 "Αποστολή μηνύματος με Ctrl+Enter και εισαγωγή νέας γραμμής με το Enter (Εξ "
 "ορισμού συμπεριφορά του πελάτη ICQ της Mirabilis)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Πόσες γραμμές να αποθηκευτούν για το Ctrl+KeyUP."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4911,23 +5338,23 @@ msgstr ""
 "Είτε δικό σας url με ένα %s σε αυτό όπου %s είναι η λέξη/φρράση ή "
 "'WIKTIONARY' που σημαίνει να γίνεται χρήση του wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Εαν είναι επιλεγμένο, το Gajim μπορεί να ελεγχθεί από μακριά χρησιμοποιόντας "
 "το gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4935,7 +5362,7 @@ msgstr ""
 "Να γίνεται πάντα ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4943,7 +5370,7 @@ msgstr ""
 "Να μην γίνεται ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4951,31 +5378,31 @@ msgstr ""
 "Προέχει του κεντρικού υπολογιστή που αποστέλουμε για Μεταφορές Αρχείων σε "
 "περίπτωση που υπάρχει μετάφραση διεύθυνσης/προώθηση πόρτας."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Να εμφανίζεται καρτέλα όταν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Να εμφανίζεται καρτέλα εάν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4984,11 +5411,11 @@ msgstr ""
 "παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου "
 "στην μπάρα ειδοποιήσεων."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Αν είναι αληθές, το Gajim καταχωρείται στο xmpp:// σε κάθε έναρξη του."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4997,15 +5424,16 @@ msgstr ""
 "έχει μη αναγνωσμένα μηνύματα. Σε μερικά θέματα, αυτό το εικονίδιο έχει "
 "κίνηση."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν "
 "είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -5013,7 +5441,7 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα κοιτάει αν κάθε επαφή που δεν είχε ως τώρα "
 "άβαταρ, έχει τώρα ή έχει αλλά είναι πεπαλαιωμένη."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5023,20 +5451,29 @@ msgstr ""
 "παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μήνυμα "
 "κατάστασης."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -5045,16 +5482,18 @@ msgstr ""
 "Αν είναι ενεργοποιημένο, και τα GTK+ και PyGTK είναι έκδοσης 2.8 και πάνω, "
 "να αναβοσβήνει το παράθυρο όταν υπάρχουν εκκρεμή γεγονότα."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Το jabberd 1.4 δεν δέχεται πληροφορίες sha όταν γίνεται σύνδεση σε ένα "
 "δωμάτιο προστατευμένο με συνθηματικό. Απενεργοποιήστε αυτή την επιλογή"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5062,7 +5501,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Καθορίζει σε ποιο παράθυρο θα εμφανίζονται τα νέα μηνύματα.\n"
 "'πάντα' - Όλα τα μηνύματα σε ένα παράθυρο.\n"
@@ -5071,53 +5510,68 @@ msgstr ""
 "'κατατύπο' - Κάθε τύπος μηνύματος έχει το δικό του παράθυρο. Αυτή η επιλογή "
 "απαιτεί επανεκκίνηση του gajim για να εφαρμοστεί."
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Αν Αληθές, πατώντας το πλήκτρο διαφυγής, κλείνει η καρτέλα/το παράθυρο."
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Αποκρύπτει τα κουμπιά στο παράθυρο προσωπικού διαλόγου"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Αποκρύπτει την κεφαλίδα στο παράθυρο προσωπικής κουβέντας"
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "Αποκρύπτει τη λίστα συμμετεχόντων στο παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Ειδική παράκαμψη για το jabberd2"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5126,59 +5580,106 @@ msgstr ""
 "διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
 "αρχείων."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Είμαι έξω στη ζωή"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Διαθέσιμος"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Διαθέσιμος για κουβέντα"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Η υπηρεσία δεν είναι διαθέσιμη"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5186,7 +5687,7 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5194,98 +5695,212 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί οποιοδήποτε μήνυμα MUC. (Αυτή η ρύθμιση "
 "ισχύει μόνο εάν είναι ορισμένη η notify_on_all_muc_messages)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "πράσινο"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "μανάβικο"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "ζεστό"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "θαλασσί"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Εσφαλμένη κωδικοφράση"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+"Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
+"%s"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτό το δωμάτιο."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτό το δωμάτιο."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Δεν υπάρχει τέτοιο δωμάτιο."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "Δεν επιτρέπεται η δημιουργία δωματίων."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Δεν είστε στη λίστα μελών."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
+"Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "Ο %s μόλις σας εξουσιοδότησε"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Το Jid %s δεν είναι σύμμορφο προς το RFC. Δεν θα προστεθεί στη λίστα επαφών "
+"σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru."
+"jabberstudio.org για να το αφαιρέσετε"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
 "επανασυνδεθείτε."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Μη έγκυρη απόκριση"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Έγινε σύνδεση με το διακομιστή %s:%s με %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "Δε δόθηκε κωδική-φράση για το OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "αόρατος"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "αποσυνδεδεμένος"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Είμαι %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5294,302 +5909,565 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Δεν υπάρχει υποστήριξη D-Bus για την python σε αυτόν τον υπολογιστή"
+
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Οι δυνατότητες του Gajim για D-Bus δε θα χρησιμοποιηθούν"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "Δεν βρέθηκε το pysqlite2 (ή python-pysqlite2). Έξοδος..."
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Μη διαθέσιμη υπηρεσία: Το Gajim δεν τρέχει ή δεν είναι ενεργοποιημένο το "
+"remote_control"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr ""
+"Δεν υπάρχει D-Bus διαθέσιμο σε αυτό το μηχάνημα ή το άρθρωμα της python "
+"λείπει"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Ο δίαυλος μηνυμάτων δεν είναι διαθέσιμος.\n"
+"Παρακαλώ συμβουλευτείτε το http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/connection_handlers.py:49
+#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
+msgid "one"
+msgstr "Τίποτα"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "ποιος"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Οδός:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Θύρα: "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "αρχείο"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Γεγονός"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Συνέχεια"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Διαγραφή"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:581
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "Registration information for transport %s has not arrived in time"
+msgid "%0 o'clock"
 msgstr ""
-"Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
-"%s"
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτό το δωμάτιο."
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτό το δωμάτιο."
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Δεν υπάρχει τέτοιο δωμάτιο."
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "Δεν επιτρέπεται η δημιουργία δωματίων."
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Δεν είστε στη λίστα μελών."
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
 msgstr ""
-"Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
-"Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "Ο %s μόλις σας εξουσιοδότησε"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Εγγραφή στο %s"
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Δουλειά"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Τίποτα"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Γεγονός"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
 msgstr ""
-"Το Jid %s δεν είναι σύμμορφο προς το RFC. Δεν θα προστεθεί στη λίστα επαφών "
-"σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru."
-"jabberstudio.org για να το αφαιρέσετε"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Απαιτείται η διεύθυνση του διακομιστή."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "Απα_σχολημένος"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Μη διαθέσιμος"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Μη διαθέσιμος"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "Διαθέσιμος για _κουβέντα"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Διαθέσιμος"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Διαθέσιμος"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "Α_πομακρυσμένος"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Απομακρυσμένος"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "Αόρατ_ος"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "?κατάσταση επαφής: Άγνωστη"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "Καμία"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Προς"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Από"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "Τίποτα"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Διαχειριστές"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Συμμετέχοντες"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Συμμετέχων"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Επισκέπτες"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Επισκέπτης"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Κανένας"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Ιδιοκτήτης"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Διαχειριστής"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Μέλος"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "γράφει ένα μήνυμα..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d μη αναγνωσμένο μήνυμα"
+msgstr[1] "Gajim - %d μη αναγνωσμένα μηνύματα"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d μη αναγνωσμένο μεμονωμένο μήνυμα"
+msgstr[1] "Gajim - %d μη αναγνωσμένα μεμονωμένα μηνύματα"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d μη αναγνωσμένο μήνυμα"
+msgstr[1] "Gajim - %d μη αναγνωσμένα μηνύματα"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d μη αναγνωσμένο προσωπικό μήνυμα"
+msgstr[1] "Gajim - %d μη αναγνωσμένα προσωπικά μηνύματα"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "κυανό"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "δημιουργία βάσης δεδομένων ιστορικού"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "για τον λογαριασμό %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Εγγραφή"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Διεύθυνση"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Απομακρυσμένος"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Λήψη"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Μη διαθέσιμος"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Διαγραφή"
+
+#~ msgid "Contact _Info"
+#~ msgstr "Πλη_ροφορίες επαφής"
+
+#~ msgid "Contact Information"
+#~ msgstr "Πληροφορίες επαφής"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Μη έγκυρο δωμάτιο ή όνομα διακομιστή"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Άγνωστη έκδοση του D-Bus: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Οι προσωπικές σας πληροφορίες δημοσιοποιήθηκαν με επιτυχία."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Μεταφορά ιστορικού..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Σύνδεση σε νέο δωμάτιο"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Απόκρυψη αυτού του μενού"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d μη αναγνωσμένο μήνυμα"
+#~ msgstr[1] "Gajim - %d μη αναγνωσμένα μηνύματα"
+
+#~ msgid "Since %s"
+#~ msgstr "Από τις %s"
+
+#~ msgid "Personal details"
+#~ msgstr "Προσωπικές πληροφορίες"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Αυτόματη εξουσιοδότηση επαφής"
 
@@ -5639,10 +6517,6 @@ msgstr "κυανό"
 #~ msgid "I want to listen to:"
 #~ msgstr "Θέλω να ακούσω:"
 
-#, fuzzy
-#~ msgid "Personal Info"
-#~ msgstr "Προσωπικές Πληροφορίες"
-
 #~ msgid "Send _New Message..."
 #~ msgstr "_Νέο Μήνυμα..."
 
@@ -5878,17 +6752,10 @@ msgstr "κυανό"
 #~ "αποθήκευσης του ιστορικού των συζητήσεων. Το Gajim μπορεί τώρα να "
 #~ "μετατρέψει το αποθηκευμένο ιστορικό. Να γίνει η μετατροπή;"
 
-#~ msgid "Service not available"
-#~ msgstr "Η υπηρεσία δεν είναι διαθέσιμη"
-
 #~ msgid "Session bus is not available."
 #~ msgstr "Ο δίαυλος του session δεν είναι διαθέσιμος."
 
 #, fuzzy
-#~ msgid "with account %s"
-#~ msgstr "για τον λογαριασμό %s"
-
-#, fuzzy
 #~ msgid "with account "
 #~ msgstr "λογαριασμός: "
 
@@ -6031,9 +6898,6 @@ msgstr "κυανό"
 #~ msgid "Click to get contact's extended information"
 #~ msgstr "Πατήστε για να έχετε περισσότερες πληροφορίες για αυτή την επαφή"
 
-#~ msgid "Enter your message:"
-#~ msgstr "Πληκτρολογήστε το μήνυμα σας:"
-
 #~ msgid "_Compact View"
 #~ msgstr "_Συμπαγής Όψη"
 
@@ -6091,9 +6955,6 @@ msgstr "κυανό"
 #~ msgid "Show roster window on Gajim startup"
 #~ msgstr "Εμφάνιση του κεντρικού παραθύρου κατά την εκκίνηση του Gajim"
 
-#~ msgid "_Join Group Chat"
-#~ msgstr "_Είσοδος σε Ομαδική Συζήτηση"
-
 #~ msgid "_Service Discovery"
 #~ msgstr "Ανακάλυψη _Υπηρεσιών"
 
diff --git a/po/eo.po b/po/eo.po
index 7fe7d3f95..c994d80c2 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4,12 +4,12 @@
 # Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>, 2006.
 # 
 # 
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-10 00:19+0500\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-10-08 18:15+0500\n"
 "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -18,6 +18,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "GTK+bazita jabber-kliento"
+
+#: ../data/gajim.desktop.in.in.h:2
+msgid "Gajim Instant Messenger"
+msgstr "Gajim tujmesaĝilo"
+
+#: ../data/gajim.desktop.in.in.h:3
+msgid "Jabber IM Client"
+msgstr "Jabber-tujmesaĝilo"
+
 #: ../data/glade/account_context_menu.glade.h:1
 msgid "Send Single _Message..."
 msgstr "Sendi unuopan _mesaĝon..."
@@ -37,6 +49,7 @@ msgid "_Group Chat"
 msgstr "_Babilejo"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Korekti konton..."
 
@@ -45,6 +58,7 @@ msgid "_Open Gmail Inbox"
 msgstr "_Malfermi poŝtkeston de Gmail"
 
 #: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stato"
 
@@ -98,7 +112,7 @@ msgid "Pass_word:"
 msgstr "Pas_vorto:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Konservi pasvorton"
 
@@ -137,7 +151,7 @@ msgid "_Host:"
 msgstr "_Retnodo:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
@@ -169,10 +183,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Cetero</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persona informo</b>"
 
@@ -189,6 +205,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Aŭtomate konekti denove kiam konekto rompiĝas"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "K_onekti dum lanĉo de Gajim"
 
@@ -208,6 +225,7 @@ msgstr ""
 "servilo subtenas ĝin, kaj tiu opcio malŝaltas TLS"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Elekti _ŝlosilon..."
 
@@ -230,8 +248,10 @@ msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46 ../src/roster_window.py:313
-#: ../src/roster_window.py:1299 ../src/roster_window.py:1685
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Ĝenerala"
 
@@ -256,6 +276,7 @@ msgstr ""
 "preventas diskonekton pro longa neaktiva tempo."
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -264,12 +285,14 @@ msgstr ""
 "por vi."
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr "Se markitas, Gajim aŭtomate konektos per tiu konto dum lanĉo"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -286,19 +309,23 @@ msgstr "Informo pri vi, kiel estas en la servilo"
 msgid "Manage..."
 msgstr "Administri..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1575
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Neniu ŝlosilo elektita"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1167
-#: ../src/config.py:1172 ../src/config.py:1353 ../src/config.py:1565
-#: ../src/config.py:1574 ../src/config.py:1633 ../src/config.py:1706
-#: ../src/config.py:2445 ../src/dialogs.py:279 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Neniu"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Persona informo"
 
@@ -321,14 +348,21 @@ msgstr ""
 "la plej granda prioritato ricevas eventojn"
 
 #: ../data/glade/account_modification_window.glade.h:32
+#, fuzzy
+msgid "Priority will change automatically according to your status."
+msgstr ""
+"Prioritato ŝanĝiĝos aŭtomate laŭ via stato. Prioritatoj specifatas enla "
+"agorderoj \"autopriority_*\"."
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Prokura servilo:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Risur_cnomo: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -341,43 +375,47 @@ msgstr ""
 "\"Hejmo\" kaj \"Laborejo\". La kliento, kiu havas la plej altan prioritaton, "
 "ricevos la eventojn."
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Konservi pas_frazon (malsekure)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Konservi komunikadajn _protokolojn por ĉiuj kontaktoj"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Sendi vivkontrolajn pakaĝojn"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Sink_ronigi kontan staton kun komuna stato"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Uzi _SSL (malnovan)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Uzi propran servilnomon/pordon"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Uzi dosiertransmetan prokuran servilon"
 
-#: ../data/glade/account_modification_window.glade.h:43
-msgid "_Adjust with status"
+#: ../data/glade/account_modification_window.glade.h:44
+#, fuzzy
+msgid "_Adjust to status"
 msgstr "_Alĝustigi laŭ stato"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Nomo: "
 
@@ -387,21 +425,35 @@ msgstr "Kontoj"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Se vi havas 2 aŭ plie kontojn kaj tio estas markita, Gajim montras ĉiujn "
 "kontaktojn, kvazaŭ vi havas unu konton"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Unuigi kontojn"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Korekti"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Forigi"
@@ -751,6 +803,7 @@ msgstr "Klaku por vidi pasintajn interparolojn kun tiu ĉi kontakto"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
 #: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Sendi _dosieron"
 
@@ -767,6 +820,7 @@ msgstr "_Kompakta vido    Alt+C"
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
 #: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historio"
 
@@ -912,7 +966,7 @@ msgstr ""
 "Babilejaj\n"
 "mesaĝoj al vi"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:601
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Paŭzas"
 
@@ -1058,8 +1112,8 @@ msgstr "Eniri babilejen"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Kaŝnomo:"
 
@@ -1127,8 +1181,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Administri prokurservilajn agordojn"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Nomo:"
 
@@ -1632,7 +1686,7 @@ msgstr "Aktiva dum la kuranta seanco"
 msgid "Active on each startup"
 msgstr "Aktiva dum ĉiu lanĉo"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2444
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr "Ĉiuj"
 
@@ -1730,6 +1784,8 @@ msgstr "Fako:"
 
 #: ../data/glade/profile_window.glade.h:10
 #: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "Retpoŝtadreso:"
 
@@ -1744,85 +1800,91 @@ msgstr "Kroma adreso:"
 msgid "Family:"
 msgstr "Familia nomo:"
 
-#. Given Name
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:15
 #: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: JJJJ-MM-TT"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
 msgid "Given:"
 msgstr "Nomo:"
 
-#: ../data/glade/profile_window.glade.h:16
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Homepage:"
 msgstr "Hejmpaĝo:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "Middle:"
 msgstr "Meznomo:"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "More"
 msgstr "Plu"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "Personal Info"
 msgstr "Persona informo"
 
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Phone No.:"
 msgstr "Telefono:"
 
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Position:"
 msgstr "Ofico:"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Postal Code:"
 msgstr "Poŝtkodo:"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
 msgid "Prefix:"
 msgstr "Prefikso:"
 
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34 ../src/vcard.py:252
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
 msgid "Role:"
 msgstr "Rolo:"
 
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "State:"
 msgstr "Ŝtato:"
 
-#: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
 msgid "Street:"
 msgstr "Strato:"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Suffix:"
 msgstr "Sufikso:"
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Work"
 msgstr "Laboro"
 
-#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/profile_window.glade.h:36
 msgid "_Publish"
 msgstr "_Publiki"
 
-#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/profile_window.glade.h:37
 msgid "_Retrieve"
 msgstr "_Reobteni"
 
@@ -1843,20 +1905,23 @@ msgid "A_sk to see his/her status"
 msgstr "Peti por vidi lian/ŝian staton"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Aligi specialan _avizon"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Enigi Open_PGP-ŝlosilon"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../src/roster_window.py:1664
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Aranĝi _Grupojn"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:1732
 msgid "In_vite to"
 msgstr "In_viti al"
 
@@ -1866,6 +1931,7 @@ msgid "Send Single _Message"
 msgstr "Sendi unuopan _mesaĝon"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Ekparoli"
 
@@ -1878,12 +1944,13 @@ msgid "_Forbid him/her to see my status"
 msgstr "_Malpermesi al li/ŝi vidi vian staton"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1616 ../src/roster_window.py:1763
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Forigi el kontaktlisto"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1751
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Renomigi"
 
@@ -1932,7 +1999,7 @@ msgid "_Discover Services"
 msgstr "_Serĉi servojn"
 
 #: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1743
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "A_dministri"
 
@@ -2063,31 +2130,37 @@ msgid "Client:"
 msgstr "Kliento:"
 
 #: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakto"
 
-#: ../data/glade/vcard_information_window.glade.h:20 ../src/dialogs.py:414
+#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Risurco:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stato:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Abono:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Protokoli komunikadan historion"
 
@@ -2122,6 +2195,44 @@ msgstr "_Mesaĝo"
 msgid "_Presence"
 msgstr "_Ĉeesto"
 
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Nomo:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Nomo:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Persona informo"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Korekti konton..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Uzi propran servilnomon/pordon"
+
 #: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Parametra nomo"
@@ -2291,13 +2402,14 @@ msgstr "Ĉifrado malebligata"
 
 #. add_to_roster_menuitem
 #: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
-#: ../src/dialogs.py:627 ../src/gajim.py:675 ../src/gajim.py:676
-#: ../src/gajim.py:1003 ../src/roster_window.py:299
-#: ../src/roster_window.py:1491 ../src/roster_window.py:1934
-#: ../src/roster_window.py:2135 ../src/roster_window.py:2146
-#: ../src/roster_window.py:2510 ../src/roster_window.py:2566
-#: ../src/roster_window.py:3402 ../src/roster_window.py:3404
-#: ../src/common/helpers.py:42 ../src/common/helpers.py:244
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "Mankas en kontaktlisto"
 
@@ -2315,29 +2427,29 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: ../src/config.py:124 ../src/config.py:559
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "malŝaltitaj"
 
-#: ../src/config.py:202
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Ĉiujn %s _minutojn"
 
-#: ../src/config.py:333
+#: ../src/config.py:336
 msgid "Active"
 msgstr "Aktiva"
 
-#: ../src/config.py:341
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:649 ../src/gajim.py:1956
+#: ../src/config.py:654 ../src/gajim.py:1978
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: ../src/config.py:650 ../src/gajim.py:1957
+#: ../src/config.py:655 ../src/gajim.py:1979
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2346,230 +2458,239 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/config.py:988
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
-#: ../src/config.py:988
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "statmesaĝa teksto"
 
-#: ../src/config.py:1023
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Unua mesaĝo ricevita"
 
-#: ../src/config.py:1024
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:1025
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Kontakto konektita"
 
-#: ../src/config.py:1026
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: ../src/config.py:1027
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Mesaĝo sendita"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: ../src/config.py:1229
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/config.py:1275
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
 
-#: ../src/config.py:1276
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:1279 ../src/config.py:1844
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Nelegita eventoj"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr "Por ŝanĝi la nomon de konto, vi devas legi atendantajn eventojn."
 
-#: ../src/config.py:1284
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Kontnomo jam estas uzata"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: ../src/config.py:1289 ../src/config.py:1293
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Kontnomo ne povas esti malplena."
 
-#: ../src/config.py:1294
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
 
-#: ../src/config.py:1302 ../src/config.py:1308 ../src/config.py:1317
-#: ../src/config.py:2831
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/config.py:1309
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber-ID devas esti en la formo \"uzulo@servilnomo\"."
 
-#: ../src/config.py:1367
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:1368
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: ../src/config.py:1488 ../src/common/config.py:347
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
-#: ../src/config.py:1498
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Ĉu rekonekti nun?"
 
-#: ../src/config.py:1499
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se vi volas ekuzi la ĉiujn ŝanĝojn, vi devas rekonekti."
 
-#: ../src/config.py:1525
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
 
-#: ../src/config.py:1526
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaŭ korekti vian personan informon."
 
-#: ../src/config.py:1532 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
 #: ../src/disco.py:414 ../src/profile_window.py:314
 #: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/config.py:1533
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
 
-#: ../src/config.py:1537
+#: ../src/config.py:1545
 msgid "Your server doesn't support Vcard"
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: ../src/config.py:1538
+#: ../src/config.py:1546
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
 
-#: ../src/config.py:1562
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
 
-#: ../src/config.py:1563
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
 
-#: ../src/config.py:1566
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/config.py:1567
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
 
 #. Name column
-#: ../src/config.py:1796 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
 #: ../src/history_window.py:78
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/config.py:1799
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Servilo"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
 
-#: ../src/config.py:1868
+#: ../src/config.py:1903
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vi havas aktivan konversacion ĉe konto %s"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1904
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Ĉiuj konversaciajn fenestrojn fermitos. Ĉu daŭrigu?"
 
-#: ../src/config.py:2064
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Kontnomo jam estas uzata"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
 
-#: ../src/config.py:2066
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
 
 #. list at the begining
-#: ../src/config.py:2137
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
 
-#: ../src/config.py:2138
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Membra listo"
 
-#: ../src/config.py:2139
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Listo de mastroj"
 
-#: ../src/config.py:2140
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Estra listo"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2173 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Kialo"
 
-#: ../src/config.py:2186
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../src/config.py:2190
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Rolo"
 
-#: ../src/config.py:2211
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Malpermesas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2213
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2577,11 +2698,11 @@ msgstr ""
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
 
-#: ../src/config.py:2215
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Aligas membron..."
 
-#: ../src/config.py:2216
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2589,11 +2710,11 @@ msgstr ""
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2218
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
 
-#: ../src/config.py:2219
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2601,11 +2722,11 @@ msgstr ""
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
 
-#: ../src/config.py:2221
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
 
-#: ../src/config.py:2222
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2613,7 +2734,7 @@ msgstr ""
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2629,89 +2750,89 @@ msgstr ""
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aŭ subdomajno)."
 
-#: ../src/config.py:2328
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
 
-#: ../src/config.py:2345 ../src/roster_window.py:2199
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: ../src/config.py:2346 ../src/roster_window.py:2200
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: ../src/config.py:2347 ../src/roster_window.py:2201
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: ../src/config.py:2360
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/config.py:2361
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: ../src/config.py:2445
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr "Nur en/el-irado"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2636
 msgid "New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/config.py:2546
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
 
-#: ../src/config.py:2547
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Bonvolu konvinkiĝi, ke kampoj Servilo kaj Babilejo estas plenitaj aŭ forigi "
 "tiun ĉi legosignon."
 
-#: ../src/config.py:2807
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:2808
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
 
-#: ../src/config.py:2817 ../src/dialogs.py:1276
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
 
-#: ../src/config.py:2818
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Vi devas enigi pasvorton por la nova konto."
 
-#: ../src/config.py:2822 ../src/dialogs.py:1281
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: ../src/config.py:2823 ../src/dialogs.py:1282
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
 
-#: ../src/config.py:2842
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Ripeta Jabber-ID"
 
-#: ../src/config.py:2843
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Tiu ĉi konto jam ĉeestas en kontlisto de Gajim."
 
-#: ../src/config.py:2860
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: ../src/config.py:2861 ../src/config.py:2894
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2719,19 +2840,19 @@ msgstr ""
 "Vi povas agordi kromajn kontajn parametrojn alklakinte butonon Krome aŭ pli "
 "poste menueron Kontoj en menuo Administri de la ĉefa fenestro."
 
-#: ../src/config.py:2893
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/config.py:2909
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: ../src/config.py:2966
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
@@ -2868,9 +2989,9 @@ msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
 #: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
 #: ../src/disco.py:1248 ../src/roster_window.py:229
-#: ../src/roster_window.py:296 ../src/roster_window.py:332
-#: ../src/roster_window.py:384 ../src/roster_window.py:411
-#: ../src/roster_window.py:3398 ../src/roster_window.py:3400
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
 #: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportiloj"
@@ -2953,7 +3074,7 @@ msgstr "Demando pri abono por konto %s de %s"
 msgid "Subscription request from %s"
 msgstr "Demando pri abono de %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:609
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
 #, python-format
 msgid "You are already in room %s"
 msgstr "Vi jam estas en babilejo %s"
@@ -3044,29 +3165,29 @@ msgstr "Nova unuobla mesaĝo"
 msgid "New Private Message"
 msgstr "Nova privata mesaĝo"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1096 ../src/notify.py:426
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1228 ../src/notify.py:420
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1070 ../src/gajim.py:1204
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
 #: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1264 ../src/gajim.py:1286
-#: ../src/gajim.py:1303 ../src/notify.py:424
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1267 ../src/notify.py:424
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:968 ../src/notify.py:428
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Babileja invitilo"
 
@@ -3326,7 +3447,7 @@ msgid "Sender: %s"
 msgstr "Sendanto: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:573
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Ricevanto: "
 
@@ -3454,11 +3575,12 @@ msgstr "Dosiero: "
 msgid "It is not possible to send empty files"
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Nomo: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Sendanto: "
 
@@ -3466,31 +3588,31 @@ msgstr "Sendanto: "
 msgid "Pause"
 msgstr "Paŭzo"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim bezonas X-servilon. Eliras..."
 
-#: ../src/gajim.py:51
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim bezonas PyGTK 2.6 aŭ pli novan"
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim bezonas PyGTK 2.6 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim bezonas GTK 2.6 aŭ pli novan"
 
-#: ../src/gajim.py:55
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim bezonas GTK 2.6 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Mankas subteno de libglade en GTK+"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3499,22 +3621,22 @@ msgstr ""
 "Bonvolu forigi vian nuntempan GTK+ bibliotekon kaj instali la plej lastan "
 "stabilan version de %s"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:65
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Bonvolu kontroli ke GTK+ kaj PyGTK en via sistemo subtenas la bibliotekon "
 "libglade."
 
-#: ../src/gajim.py:69
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim bezonas PySqlITE2 por funkcii"
 
-#: ../src/gajim.py:76
+#: ../src/gajim.py:77
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim bezonas pywin32 por funkcii"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:78
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3524,11 +3646,11 @@ msgstr ""
 "povas preni ĝin ĉe %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:157
+#: ../src/gajim.py:158
 msgid "Gajim is already running"
 msgstr "Gajim jam estas lanĉita"
 
-#: ../src/gajim.py:158
+#: ../src/gajim.py:159
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3536,75 +3658,75 @@ msgstr ""
 "Alia ekzemplero of Gajim ŝajne estas lanĉita\n"
 "Ĉu lanĉu malgraŭ tio?"
 
-#: ../src/gajim.py:258
+#: ../src/gajim.py:259
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:260
 msgid "Do you accept this request?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gajim.py:305 ../src/notify.py:432
+#: ../src/gajim.py:306 ../src/notify.py:432
 msgid "Connection Failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/gajim.py:608
+#: ../src/gajim.py:609
 #, python-format
 msgid "Subject: %s"
 msgstr "Temo: %s"
 
-#: ../src/gajim.py:651
+#: ../src/gajim.py:654
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "eraro dum sendado %s ( %s )"
 
-#: ../src/gajim.py:691
+#: ../src/gajim.py:694
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: ../src/gajim.py:692
+#: ../src/gajim.py:695
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "La kontakto \"%s\" permisas al vi vidi lian aŭ ŝian staton."
 
-#: ../src/gajim.py:700
+#: ../src/gajim.py:703
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: ../src/gajim.py:701
+#: ../src/gajim.py:704
 msgid "You will always see him or her as offline."
 msgstr "Vi ĉiam vidos ŝin aŭ lin senkonekta."
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:747
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakto kun \"%s\" neestableblas"
 
-#: ../src/gajim.py:745 ../src/common/connection.py:388
+#: ../src/gajim.py:748 ../src/common/connection.py:389
 msgid "Check your connection or try again later."
 msgstr "Kontrolu vian konekton aŭ provu denove poste."
 
-#: ../src/gajim.py:890 ../src/roster_window.py:1115
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s nun estas %s (%s)"
 
-#: ../src/gajim.py:978
+#: ../src/gajim.py:981
 msgid "Your passphrase is incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gajim.py:979
+#: ../src/gajim.py:982
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
 
-#: ../src/gajim.py:1081
+#: ../src/gajim.py:1084
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nova retletero ĉe %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1083
+#: ../src/gajim.py:1086
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3614,7 +3736,7 @@ msgstr[1] "Vi havas %d novajn retleterojn"
 #. FIXME: emulate Gtalk client popups. find out what they parse and how
 #. they decide what to show
 #. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1092
+#: ../src/gajim.py:1095
 #, python-format
 msgid ""
 "\n"
@@ -3623,65 +3745,74 @@ msgstr ""
 "\n"
 "De: %(from_adress)s"
 
-#: ../src/gajim.py:1225
+#: ../src/gajim.py:1228
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gajim.py:1287
+#: ../src/gajim.py:1290
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "La dosiero %(filename)s de %(name)s estas sukcese ricevita."
 
 #. ft stopped
-#: ../src/gajim.py:1291
+#: ../src/gajim.py:1294
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: ../src/gajim.py:1304
+#: ../src/gajim.py:1307
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vi sukcese sendis %(filename)s al %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1311
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Bonvolu plenigi datumon por via nova konto</b>"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1729
+#: ../src/gajim.py:1747
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: ../src/gajim.py:1976
+#: ../src/gajim.py:1998
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Subteno de seancagordo nedisponeblas (mankas modulo gnome.ui)"
 
-#: ../src/gajim-remote.py:65
+#: ../src/gajim-remote.py:66
 msgid "Shows a help on specific command"
 msgstr "Montri helpon pri specifita komando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:68
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "komando"
 
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "montri helpon pri komando"
 
-#: ../src/gajim-remote.py:73
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Antaŭigas fenestron kun la sekva nelegita mesaĝo"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3689,47 +3820,47 @@ msgstr ""
 "Eligas liston de ĉiuj kontaktoj de kontaktlisto. Ĉiu kontakto aperasen "
 "separata lineo"
 
-#: ../src/gajim-remote.py:83 ../src/gajim-remote.py:97
-#: ../src/gajim-remote.py:107 ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:208
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "Montri kontaktojn nur de specifita konto"
 
-#: ../src/gajim-remote.py:88
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Eligas liston de registritaj kontoj"
 
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "stato"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "unu el: senkonekta, enreta, babilas, fora, nedisponebla, okupata, nevidebla "
 
-#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "mesaĝo"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "statmesaĝo"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3738,19 +3869,19 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Montras interparolan fenestron do vi povas sendi mesaĝon al kontakto"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
-#: ../src/gajim-remote.py:107 ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Se specifita, kontakto estos prenata el kontaktlisto de tiu ĉi konto"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:113
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -3760,27 +3891,27 @@ msgstr ""
 "kaj konto estas fakultativaj. Se vi volas specifi nur konton sen OpenPGP-"
 "ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "ŝlosilo de pgp"
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Se specifita, la mesaĝo estos ĉifrita per tiu ĉi publika ŝlosilo"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "Se specifita, la mesaĝo estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:126
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -3790,125 +3921,125 @@ msgstr ""
 "ŝlosilo kaj konto estas fakultativaj. Se vi volas specifi nur konton sen "
 "OpenPGP-ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:131
 msgid "subject"
 msgstr "temo"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:131
 msgid "message subject"
 msgstr "temo de mesaĝo"
 
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Ricevas detalan informon pri kontakto"
 
-#: ../src/gajim-remote.py:141 ../src/gajim-remote.py:154
-#: ../src/gajim-remote.py:184 ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID de la kontakto"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Ricevas detalan informon pri konto"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Nomo de la konto"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Sendi dosieron al kontakto"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "dosiero"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Dosierindiko"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "Se specifita, dosiero estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Listo de ĉiuj parametroj kaj ilia valoroj"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Valorigi \"ŝlosilo\" per \"valoro\"."
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "ŝlosilo=valoro"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "\"ŝlosilo\" estas nomo de parametro, \"valoro\" estas ĝia stato"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Forigas parametron"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "ŝlosilo"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "nomo de forigota parametro"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skribas la aktualan agordon de Gajim en la dosieron \".config\""
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Aligas kontakton en kontaktliston"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:195
 msgid "Adds new contact to this account"
 msgstr "Aldonas novan kontakton en tiun konton"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Donas tuntempan staton (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote.py:206
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "Donas tuntempan statmesaĝon (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Donas kvanton de lelegitaj mesaĝoj"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:218
 msgid "Opens 'Start Chat' dialog"
 msgstr "Malfermi \"Ekparoli\" dialogfenestron"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:220
 msgid "Starts chat, using this account"
 msgstr "Babili per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:224
 msgid "Sends custom XML"
 msgstr "Sendi propran XML"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:226
 msgid "XML to send"
 msgstr "XML por sendi"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:227
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -3916,11 +4047,11 @@ msgstr ""
 "Konto kien la xml sendotas; se konto nespecifitas, xml sendotas al ĉiuj "
 "kontoj"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Mankas argumento \"kontakt-jid\""
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3929,11 +4060,11 @@ msgstr ""
 "%s mankas en via kontaktlisto\n"
 "Bonvolu specifi konton por sendi la mesaĝon."
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Vi ne havas aktivan konton"
 
-#: ../src/gajim-remote.py:334
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3942,16 +4073,16 @@ msgstr ""
 "Uzado: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:337
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Atgumentoj:"
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s ne trovitas"
 
-#: ../src/gajim-remote.py:345
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3960,7 +4091,7 @@ msgstr ""
 "Uzado: %s komando [argumentoj]\n"
 "Komando estas unu el:\n"
 
-#: ../src/gajim-remote.py:419
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -4059,7 +4190,7 @@ msgid "%s has joined the room"
 msgstr "%s aliĝis al la babilejo"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1118
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s nun estas %s"
@@ -4206,65 +4337,65 @@ msgstr ""
 msgid "No help info for /%s"
 msgstr "helpinformo mankas por /%s"
 
-#: ../src/groupchat_control.py:1307
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/groupchat_control.py:1308
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Se vi fermos tiun fenestron, vi senkonektiĝos de tiu babilejo."
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "_Ne plu demandi"
 
-#: ../src/groupchat_control.py:1346
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: ../src/groupchat_control.py:1347
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/groupchat_control.py:1357
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Legosigno jam estas metita"
 
-#: ../src/groupchat_control.py:1384
+#: ../src/groupchat_control.py:1386
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
 
-#: ../src/groupchat_control.py:1393
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Legosigno sukcese aligitas"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Vi povas aranĝi viajn legosignojn per menuero \"Agoj\" en la kontaktlisto."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1511
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: ../src/groupchat_control.py:1512 ../src/groupchat_control.py:1795
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1794
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
@@ -4424,11 +4555,11 @@ msgstr "Stato nun estas: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Stato nun estas: %(status)s"
 
-#: ../src/message_window.py:264
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Mesaĝoj"
 
-#: ../src/message_window.py:265
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4520,24 +4651,24 @@ msgstr "Senkonekte vi ne povas ricevi vian kontaktan informon."
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: ../src/roster_window.py:311 ../src/common/helpers.py:42
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Rigardiloj"
 
-#: ../src/roster_window.py:613 ../src/roster_window.py:2666
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:814
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "al konto %s"
 
 #. disco
-#: ../src/roster_window.py:819
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "per konto %s"
@@ -4545,50 +4676,50 @@ msgstr "per konto %s"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:825 ../src/systray.py:181 ../src/systray.py:186
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "per konto %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:891
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "de konto %s"
 
-#: ../src/roster_window.py:911
+#: ../src/roster_window.py:901
 msgid "_Manage Bookmarks..."
 msgstr "Aranĝi _legosignojn..."
 
-#: ../src/roster_window.py:940
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "por konto %s"
 
 #. History manager
-#: ../src/roster_window.py:961
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: ../src/roster_window.py:970
+#: ../src/roster_window.py:960
 msgid "_Join New Group Chat"
 msgstr "_Eniri babilejen"
 
-#: ../src/roster_window.py:1260 ../src/roster_window.py:2850
-#: ../src/roster_window.py:2856
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
 msgid "You have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: ../src/roster_window.py:1261
+#: ../src/roster_window.py:1259
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaŭ forigi tiun transportilon."
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4596,11 +4727,11 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: ../src/roster_window.py:1267
+#: ../src/roster_window.py:1265
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: ../src/roster_window.py:1272
+#: ../src/roster_window.py:1270
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4609,71 +4740,71 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiuj ĉi "
 "transportiloj:%s"
 
-#: ../src/roster_window.py:1316
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Atribui OpenPGP-ŝlosilon"
 
-#: ../src/roster_window.py:1317
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Elektu ŝlosilon por atribui al la kontakto"
 
-#: ../src/roster_window.py:1456 ../src/roster_window.py:1631
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
 msgid "_New room"
 msgstr "_Nova babilejo"
 
-#: ../src/roster_window.py:1514
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Mi volus aldoni vin en mian kontaktliston"
 
-#: ../src/roster_window.py:1690
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Re_nomigi"
 
-#: ../src/roster_window.py:1720
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "E_nsaluti"
 
-#: ../src/roster_window.py:1730
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "E_lsaluti"
 
-#: ../src/roster_window.py:1829
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "Ŝanĝi _statmesaĝon"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Permeso estas sendita"
 
-#: ../src/roster_window.py:1911
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: ../src/roster_window.py:1935
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: ../src/roster_window.py:1936
+#: ../src/roster_window.py:2106
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" akceptas tiun peton vi povos koni lian aŭ ŝian staton."
 
-#: ../src/roster_window.py:1947
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Permeso estas forigita"
 
-#: ../src/roster_window.py:1948
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:2154
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakto \"%s\" estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:2158
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4681,7 +4812,7 @@ msgstr ""
 "Forigante tiun kontakton vi forigas ankaŭ permison, rezulte ŝi aŭ li ĉiam "
 "vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:2162
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4689,16 +4820,16 @@ msgstr ""
 "Forigante tiu ĉi konton vi defaŭlte ankaŭ forigas permeson pro kio li aŭ ŝi "
 "ĉiamvidos vin senkonekta."
 
-#: ../src/roster_window.py:2163
+#: ../src/roster_window.py:2334
 msgid "I want this contact to know my status after removal"
 msgstr "Permesi al tiu ĉi konto koni mian staton post forigado"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2167
+#: ../src/roster_window.py:2338
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktoj estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:2171
+#: ../src/roster_window.py:2342
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4707,32 +4838,32 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: ../src/roster_window.py:2246
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Jonservi pasfrazon"
 
-#: ../src/roster_window.py:2254
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Malprava pasfrazo"
 
-#: ../src/roster_window.py:2255
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
 
-#: ../src/roster_window.py:2307 ../src/roster_window.py:2366
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
 
-#: ../src/roster_window.py:2308 ../src/roster_window.py:2367
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4740,36 +4871,36 @@ msgstr ""
 "Ŝanĝo de via stato per nevidebla okazigos diskonektadon de tiuj babilejoj. "
 "Ĉu vi certas ke vi volas iĝi nevidebla?"
 
-#: ../src/roster_window.py:2324
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2496
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Vi devas krei konton antaŭ vi povos paroli kun aliaj kontaktoj."
 
-#: ../src/roster_window.py:2420
-#, python-format
-msgid "♪ \"%(title)s\" by %(artist)s ♪"
+#: ../src/roster_window.py:2591
+#, fuzzy, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr "♪ \"%(title)s\" de %(artist)s ♪"
 
-#: ../src/roster_window.py:2851 ../src/roster_window.py:2857
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr "Mesaĝoj disponeblos por legi ĝin poste nur se vi ŝaltis historion."
 
-#: ../src/roster_window.py:3671
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Movi %s en la grupon %s"
 
-#: ../src/roster_window.py:3678
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Igi %s kaj %s metakontaktoj"
 
-#: ../src/roster_window.py:3864
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Ŝanĝi statmesaĝon..."
 
@@ -4777,84 +4908,93 @@ msgstr "Ŝanĝi statmesaĝon..."
 msgid "_Change Status Message..."
 msgstr "Ŝanĝi _statmesaĝon..."
 
-#: ../src/tooltips.py:310 ../src/tooltips.py:489
-msgid "Jabber ID: "
-msgstr "Jabber-ID: "
+#: ../src/tooltips.py:316
+msgid "Role: "
+msgstr "Rolo: "
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:493
+#: ../src/tooltips.py:317
+#, fuzzy
+msgid "Affiliation: "
+msgstr "Aparteneco:"
+
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Risurco: "
 
-#: ../src/tooltips.py:316
+#: ../src/tooltips.py:323
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this room"
 msgstr "%(owner_or_admin_or_member)s de tiu ĉi babilejo"
 
-#: ../src/tooltips.py:426 ../src/tooltips.py:610
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
+msgid "Subscription: "
+msgstr "Abono: "
+
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
+
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:457
+#: ../src/tooltips.py:484
 #, python-format
 msgid "Last status: %s"
 msgstr "Lasta stato: %s"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:486
 #, python-format
 msgid " since %s"
 msgstr " ekde %s"
 
-#. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:499
-msgid "Subscription: "
-msgstr "Abono: "
-
-#: ../src/tooltips.py:509
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
+#: ../src/tooltips.py:516
+msgid "Jabber ID: "
+msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Elŝuti"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Alŝuti"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Transmetitas: "
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Ne lanĉitas"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Haltis"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Plenumita"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Malrapidas"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Transdonas"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Tiu ĉi servo ankoraŭ ne respondis kun detala informo"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4862,24 +5002,24 @@ msgstr ""
 "Tiu ĉi servo ne povis respondi per detala informo.\n"
 "Ĝi verŝajne estas malnova aŭ rompita"
 
-#: ../src/vcard.py:203
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:205
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:226
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "ekde %s"
 
-#: ../src/vcard.py:256
+#: ../src/vcard.py:257
 msgid "Affiliation:"
 msgstr "Aparteneco:"
 
-#: ../src/vcard.py:264
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4887,29 +5027,29 @@ msgstr ""
 "Tiu ĉi kontakto interesiĝas pri via ĉeesta informo, sed vi ne interesiĝas "
 "pri ŝia/lia ĉeesto"
 
-#: ../src/vcard.py:266
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 "Vi interesiĝas pri kontakta ĉeesta informo, sed li/ŝi ne interesiĝas pri via"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:269
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vi kaj la kontakto ineresiĝas unu pri alia ĉeesta informo"
 
 #. None
-#: ../src/vcard.py:270
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Nek vi nek kontakto ne ineresiĝas unu pri ĉeesto de alia"
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:279
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Vi atendas respondon de kontakto pri via abona mendo"
 
-#: ../src/vcard.py:290 ../src/vcard.py:315
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr "Risurco kun prioritato "
 
@@ -4938,36 +5078,40 @@ msgstr "%s estas dosierujo sed devas esti dosiero"
 msgid "creating %s directory"
 msgstr "kreas dosierujon %s"
 
-#: ../src/common/config.py:53
+#: ../src/common/config.py:54
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Uzi D-Bus kaj avizadan demonon por montri avizojn"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al fora."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Aŭtomate fora"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al nedosponebla."
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Nedisponebla pro longa senfarado"
 
-#: ../src/common/config.py:80
+#: ../src/common/config.py:81
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas"
 
 #: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:88
 msgid "Language used by speller"
 msgstr "Lingvo uzata de literumilo"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -4977,7 +5121,7 @@ msgstr ""
 "'sometimes' - eligi tempon ĉiun print_ichat_every_foo_minutes minuton.\n"
 "'never' - neniam eligi tempon."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
@@ -4987,18 +5131,18 @@ msgstr ""
 "de 1 ĝis 4 aŭ 0 por malŝalti malprecizan horloĝon. 1 estas por la plej "
 "preciza, 4 por la malplej preciza."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Trakti parojn * / _ kiel stiligajn signojn."
 
-#: ../src/common/config.py:92
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se \"True\", ne forigos */_ . Do *abc* estos dika sed restos kun neforigitaj "
 "* *."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid ""
 "Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
 "(If you want to use this, install docutils)"
@@ -5006,7 +5150,7 @@ msgstr ""
 "Uzas restrukturitan tekstan markadon por HTML, kaj ASCII-formatadon, se "
 "elektitas. (Se vi volas uzi tion, instalu docutils)"
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -5014,7 +5158,7 @@ msgstr ""
 "Signo kiu aligatos post kaŝnomo dum uzado de plenumigoklavo (Tab) en "
 "babilejo."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -5022,11 +5166,11 @@ msgstr ""
 "Signo por aligi post dezirata kaŝnomo kiam iu alia en babilejo jam okupigis "
 "tiun kaŝnomon."
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Aligi * kaj [n] al kontaktlisto titolo?"
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5034,11 +5178,11 @@ msgstr ""
 "Kiom da lineoj memori de antaŭa komunikado kiam interparola slipo/fenestro "
 "malfermas denove."
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kiom da minutoj devas resti lastaj lineoj de antaŭa komunikado."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5046,11 +5190,11 @@ msgstr ""
 "Sendi mesaĝon per Ctrl+Enter kaj Enter faras novan lineon (defaŭlta "
 "kondutmaniero de Mirabilis ICQ Kliento)."
 
-#: ../src/common/config.py:143
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kiom lineojn memori por Ctrl+KeyUP."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5059,11 +5203,11 @@ msgstr ""
 "Enigi propran URL kun %s en ĝi, kie %s estos la vorto/frazo, aŭ \"WIKTIONARY"
 "\" kio signifas uzi wiktionary."
 
-#: ../src/common/config.py:149
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se markitas, oni eblas komandi al Gajim malproksime per gajim-remote."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -5071,11 +5215,11 @@ msgstr ""
 "Kiam ne eligas tempon por ĉiu mesaĝo (print_time==sometimes), eligi ĝin "
 "ĉiujn x minutojn."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -5083,7 +5227,7 @@ msgstr ""
 "Ĉiam demandi antaŭ fermi slipon/fenestron de babilejo el tiu cpacetdisigita "
 "listo de babilejaj JID."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -5091,7 +5235,7 @@ msgstr ""
 "Neniam demandi antaŭ fermi babilejan slipon/fenestron el tiu ĉi listo de "
 "babilejaj JID separataj per spacetoj."
 
-#: ../src/common/config.py:158
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5099,30 +5243,30 @@ msgstr ""
 "Redifinas la retadreson, kiun ni sendas por dosiertransmeto okaze de "
 "adrestradukado."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC normo diras: KiB = 1024 bajtoj, KB = 1000 bajtoj."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Montri langeton kiam estas nur unu konversacio?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:171
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Monti langetan framon en interparolajn fenestrojn?"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Montri fermontan butonon en sliplangeto"
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 "listo de punktokome separataj vortoj, kiuj estos emfazataj en babilejo."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5130,11 +5274,11 @@ msgstr ""
 "Se \"True\", finas Gajim kiam oni alklakas fenestran sisteman butonon X. "
 "Tiun ĉi parametron mi konsideras nur se pleta piktogramo uzatas."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Se \"True\", Gajim registros por xmpp:// dum ĉiu lanĉo."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5142,7 +5286,7 @@ msgstr ""
 "Se \"True\", Gajim montros piktogramon sur ĉiuj langeton, kies slipo enhavas "
 "nelegintajn mesaĝojn. Depende de etoso tiu piktogramo povas esti animaciata."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:189
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -5150,7 +5294,7 @@ msgstr ""
 "Se estas \"True\", Gajim montros statmesaĝojn, se ĝi ne estas malplena, por "
 "ĉiu kontakto sub la kontaktnomo en la kontaktlisto."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -5158,7 +5302,7 @@ msgstr ""
 "Se \"True\", Gajim demandos pri kaŝbildeto ĉiun kontakton, kiu ne havis ĝin "
 "lastatempe aŭ kies kaŝbildeto estis konservita tro antaŭlonge."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:192
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -5166,7 +5310,7 @@ msgstr ""
 "Se \"False\", Gajim ne plu eligos statlineon en interparolaj fenestroj kiam "
 "kontakto ŝanĝas lian aŭ ŝian staton kaj/aŭ satmesaĝon."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -5179,21 +5323,21 @@ msgstr ""
 "statmesaĝon. Se \"all\", Gajim eligos ĉiuj statmesaĝoj. Se \"in_and_out\", "
 "Gajim eligos nur pri eniroj/eliroj."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:196
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se \"True\", rememoritaj mesaĝoj uzos pli malgrandan tiparon ol defaŭltaj."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne montri kaŝbildeton por transportilo mem."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:198
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne montri kontaktliston en la sistema taskostrio."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -5203,7 +5347,7 @@ msgstr ""
 "fenestran briladon (la defaŭlta konduto de plimulto da fenestragordiloj) "
 "kiam estas atendantaj eventoj."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:201
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in group chat presences."
@@ -5213,7 +5357,7 @@ msgstr ""
 "informon en babilejo."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:202
+#: ../src/common/config.py:204
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5231,51 +5375,51 @@ msgstr ""
 "apartan fenestron. Rimarku, ŝanĝo de tiu opcio bezonas relanĉon de Gajim "
 "antaŭ la ŝanĝo efikos."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:205
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se \"False\", vi ne plu vidos la kaŝbildetojn en la babileja fenestro."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:206
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se \"True\", premo de la klavo \"Escape\" fermas slipon/fenestron."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:207
 msgid "Hides the buttons in group chat window."
 msgstr "Kaŝas la butonojn en babileja fenestro."
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:208
 msgid "Hides the buttons in two persons chat window."
 msgstr "Kaŝas la butonojn en dupersona interparola fenestro."
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Kaŝas rubandon en babileja fenestro"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Kaŝas rubandon en dupersona interparola fenestro"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:211
 msgid "Hides the room occupants list in group chat window."
 msgstr "Kaŝas la liston de partoprenantoj en la babileja fenestro."
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:212
 msgid "Merge consecutive nickname in chat window."
 msgstr "Unigi ripetajn kaŝnomojn en konversacia fenestro."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:213
 msgid "Indentation when using merge consecutive nickame."
 msgstr "Alineo kiam uzatas unigo de ripetaj kaŝnomoj."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:214
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr "Listo de koloroj kiuj estos uzata por kolorigi kaŝnomojn en babilejoj."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:215
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab iras al sekva konversacian langeton se ĉiuj legitas"
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:226
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -5284,11 +5428,11 @@ msgstr ""
 "agorderoj \"autopriority_*\"."
 
 #. yes, no, ask
-#: ../src/common/config.py:253
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 ĉirkaŭiro"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5296,101 +5440,101 @@ msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: ../src/common/config.py:310
+#: ../src/common/config.py:317
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
-#: ../src/common/config.py:311 ../src/common/config.py:314
+#: ../src/common/config.py:318 ../src/common/config.py:321
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:327
 msgid "all or space separated status"
 msgstr "'all' aŭ spacetseparitaj statoj"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:328
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', aŭ 'both'"
 
-#: ../src/common/config.py:322 ../src/common/config.py:324
-#: ../src/common/config.py:325 ../src/common/config.py:328
-#: ../src/common/config.py:329
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' aŭ ''"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Revenos baldaŭ"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Manĝas"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Mi manĝas, do restigu mesaĝon por mi."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Kino"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Laboras"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefonado"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: ../src/common/config.py:341
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Eliris"
 
-#: ../src/common/config.py:341
+#: ../src/common/config.py:348
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:352
 msgid "I'm available."
 msgstr "Mi disponeblas"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:353
 msgid "I'm free for chat."
 msgstr "Mi babilemas"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:355
 msgid "I'm not available."
 msgstr "Mi ne disponeblas"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:356
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: ../src/common/config.py:350 ../src/common/config.py:351
+#: ../src/common/config.py:357 ../src/common/config.py:358
 msgid "Bye!"
 msgstr "Ĝis!"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5398,7 +5542,7 @@ msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: ../src/common/config.py:361
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5406,31 +5550,34 @@ msgstr ""
 "Sono por ludi kiam ĉiu mesaĝo en babilejo venas. (Tiun ĉi parametron mi "
 "konsideras nur se parametro \"notify_on_all_muc_messages\" estas \"True\")"
 
-#: ../src/common/config.py:369 ../src/common/optparser.py:191
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "verda"
 
-#: ../src/common/config.py:373 ../src/common/optparser.py:177
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "manĝbutiko"
 
-#: ../src/common/config.py:377
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "homa"
 
-#: ../src/common/config.py:381
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "mara"
 
 #: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
 msgid "Unable to load idle module"
 msgstr "Neeblas ŝargi senfaran modulon"
 
 #: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
 msgid "Wrong host"
 msgstr "Malprava servilnomo"
 
 #: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5522,81 +5669,87 @@ msgstr ""
 "JID %s ne estas norma laŭ la RFC. Ĝi ne aldonitos al via kontaktlisto. Uzu "
 "konaktlistan agordan ilon kiel http://jru.jabberstudio.org/ por forigi ĝin"
 
-#: ../src/common/connection.py:161
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:162
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Por plu sendi kaj ricevi mesaĝojn, vi bezonas rekonekti."
 
-#: ../src/common/connection.py:174 ../src/common/connection.py:200
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Transportilo %s respondis malprave al registra peto."
 
 #. wrong answer
-#: ../src/common/connection.py:199
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Nekorekta respondo"
 
-#: ../src/common/connection.py:387 ../src/common/connection.py:422
-#: ../src/common/connection.py:860
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:401
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Konektis al servilo %s:%s per %s"
 
-#: ../src/common/connection.py:423
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Kontrolu vian konekton aŭ provu denove poste"
 
-#: ../src/common/connection.py:448
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Aŭtentokontrolo malsukcesis kun \"%s\""
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:563
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP-pasfrazo ne estis donita"
 
 #. %s is the account name here
-#: ../src/common/connection.py:565
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vi estos konektita al %s sen OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:605
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "nevidebla"
 
-#: ../src/common/connection.py:606
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "senkonekta"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Mi estas %s"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:698
+#: ../src/common/connection.py:699
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
 
-#: ../src/common/connection.py:747
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5605,7 +5758,7 @@ msgstr ""
 "Temo: %s\n"
 "%s"
 
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:885
 msgid "Not fetched because of invisible status"
 msgstr "Ne obtenita pro nevidebla stato"
 
@@ -6049,6 +6202,31 @@ msgstr "indeksigas protokolan datumbazon"
 msgid "Gajim account %s"
 msgstr "Gajim-konto %s"
 
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Ne povas alŝuti bildon"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Ne povas konekti al \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+#, fuzzy
+msgid "[This message is encrypted]"
+msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
+
 #~ msgid "New Room"
 #~ msgstr "Nova babilejo"
 
@@ -6058,15 +6236,6 @@ msgstr "Gajim-konto %s"
 #~ msgid "_Join New Room"
 #~ msgstr "_Aliĝi al nova babilejo"
 
-#~ msgid "A GTK+ Jabber client"
-#~ msgstr "GTK+bazita jabber-kliento"
-
-#~ msgid "Gajim Instant Messenger"
-#~ msgstr "Gajim tujmesaĝilo"
-
-#~ msgid "Jabber IM Client"
-#~ msgstr "Jabber-tujmesaĝilo"
-
 #~ msgid "Hide this menu"
 #~ msgstr "Kaŝi tiun ĉi menuon"
 
@@ -6111,9 +6280,6 @@ msgstr "Gajim-konto %s"
 #~ msgid "Contact Information"
 #~ msgstr "Kontakta informo"
 
-#~ msgid "Format: YYYY-MM-DD"
-#~ msgstr "Formato: JJJJ-MM-TT"
-
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
 
@@ -6132,9 +6298,6 @@ msgstr "Gajim-konto %s"
 #~ msgid "Please wait while logs are being migrated..."
 #~ msgstr "Bonvolu atendi dum protokoloj estas portata..."
 
-#~ msgid "Role: "
-#~ msgstr "Rolo: "
-
 #~ msgid "Since %s"
 #~ msgstr "Ekde %s"
 
diff --git a/po/es.po b/po/es.po
index 82ec8ea51..80072d2ec 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,12 +4,12 @@
 # This file is distributed under the same license as the gajim package.
 # Automatically generated, 2004.
 # 
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-03 01:19+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Mensajero Gajim"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
 
@@ -44,16 +44,23 @@ msgid "_Discover Services..."
 msgstr "_Descubrir servicios..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Grupos de charla"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modificar cuenta..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Abrir el compositor de correo"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Estado"
 
@@ -108,7 +115,7 @@ msgid "Pass_word:"
 msgstr "_Contraseña: "
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "_Guardar contraseña"
 
@@ -132,7 +139,7 @@ msgid "Your JID:"
 msgstr "Tu JID"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Avanzado"
 
@@ -146,7 +153,7 @@ msgid "_Host:"
 msgstr "_Servidor"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "C_ontraseña:"
 
@@ -179,10 +186,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Miscelánea</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Información personal</b>"
 
@@ -199,6 +208,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Autoreconectar si se pierde la conexión"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar al inicio de Gajim"
 
@@ -218,6 +228,7 @@ msgstr ""
 "en el servidor, y que con esta opción se desactiva el TLS"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Elegir _clave..."
 
@@ -234,16 +245,16 @@ msgid "Edit Personal Information..."
 msgstr "_Editar información personal personales..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:395
-#: ../src/notify.py:417 ../src/notify.py:429 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:45
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:299 ../src/roster_window.py:1258
-#: ../src/roster_window.py:1642
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "General"
 
@@ -266,6 +277,7 @@ msgstr ""
 "prevenir que expire la conexión"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -274,6 +286,7 @@ msgstr ""
 "de lectura sólamente para tí"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -282,6 +295,7 @@ msgstr ""
 "usando esta cuenta."
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -299,18 +313,23 @@ msgstr "Información acerca de tí a guardar en el servidor"
 msgid "Manage..."
 msgstr "Gestionar..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1515
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1112
-#: ../src/config.py:1117 ../src/config.py:1289 ../src/config.py:1573
-#: ../src/config.py:1646 ../src/config.py:2356
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Ninguno"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Información personal"
 
@@ -333,14 +352,18 @@ msgstr ""
 "cuenta. El cliente con mayor prioridad recibe los eventos."
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Re_curso: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -355,40 +378,47 @@ msgstr ""
 "tiempo. El recurso que tenga la prioridad más alta será el que reciba los "
 "eventos (mira más abajo)."
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Guardar contraseña (inseguro)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Grabar conversaciones para todos los contactos"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Enviar paquetes de mantenimiento de actividad"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar el estado de la cuenta con el estado global"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (el viejo)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Usar nombre de host y puerto personalizados"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 #, fuzzy
 msgid "Use file transfer proxies"
 msgstr "lista de transferencias"
 
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Nombre: "
 
@@ -398,21 +428,35 @@ msgstr "Cuentas"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Si tienes dos o más cuentas y está marcado, Gajim listará todos los "
 "contactos de forma mixta"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Combinar las cuentas"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Eliminar"
@@ -572,7 +616,7 @@ msgid "All Status "
 msgstr "Estado: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "Away"
 msgstr "Ausente"
 
@@ -590,7 +634,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -600,7 +644,7 @@ msgid "Launch a command"
 msgstr "comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "Not Available"
 msgstr "No disponible"
 
@@ -754,7 +798,8 @@ msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "Iniciar conversación"
@@ -765,6 +810,7 @@ msgstr "Click para ver anteriores conversaciones con este contacto"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
 #: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Enviar archivo"
 
@@ -781,6 +827,7 @@ msgstr "Vista _compacta    Alt+C"
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
 #: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Histórico"
 
@@ -848,7 +895,7 @@ msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Cuando una transferencia se completa, muestra una notificación emergente"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -884,66 +931,62 @@ msgstr ""
 "Contacto\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/config.py:327
-msgid "Active"
-msgstr "Activo"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/glade/gajim_themes_window.glade.h:6
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Estilo:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Personalización de temas de Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 #, fuzzy
 msgid "Gone"
 msgstr "Ninguno"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 #, fuzzy
 msgid "Inactive"
 msgstr "Activo"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 #, fuzzy
 msgid ""
 "MUC\n"
 "Messages"
 msgstr "Mensaje"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Pausado"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "_Color del texto:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "_Fuente del texto:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Fondo"
 
@@ -1058,7 +1101,7 @@ msgid "Accept"
 msgstr "Aceptar"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Denegar"
 
@@ -1066,13 +1109,14 @@ msgstr "Denegar"
 msgid "Invitation Received"
 msgstr "Invitación recibida"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1067
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Alias:"
 
@@ -1090,13 +1134,8 @@ msgstr "Recientemente:"
 msgid "Room:"
 msgstr "Salón:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Servidor:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1510
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1121,6 +1160,10 @@ msgstr "Gestionar marcadores"
 msgid "Print status:"
 msgstr "Insertar la hora:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Servidor:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Título:"
@@ -1142,7 +1185,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Gestionar perfiles del Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -1159,20 +1203,21 @@ msgstr "Usar autentificación"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Haz click para insertar un emoticono (Alt+E)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1026
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "Encriptación OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Acciones"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -1248,18 +1293,25 @@ msgid "Also known as iChat style"
 msgstr "También conocido como estilo iChat"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Preguntar mensaje de estado cuando esté: "
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Poner _ausente después de:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Poner _no disponible después de:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1271,20 +1323,20 @@ msgstr ""
 "Siempre usar las apliacciones por defecto de KDE\n"
 "Personalizado"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid "B_efore nickname:"
 msgstr "Antes del nombre:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:773
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Charla"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Noti_ficaciones del estado del chat"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1294,45 +1346,45 @@ msgstr ""
 "Úsalo con precaución ya que bloqueará todos los mensajes de cualquier "
 "contacto que no esté en tu lista de contactos."
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Mensaje de estado"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default status _iconset:"
 msgstr "_Iconos de estado por defecto:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostrar en el roster los avatares de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar en el roster los mensajes de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 #, fuzzy
 msgid "E_very 5 minutes"
 msgstr "Cada 5 _minutos"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Gestionar emoticonos"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Eventos"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:40
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1342,7 +1394,7 @@ msgstr ""
 "Gajim puede enviar y recibir meta-información relacionada con una "
 "conversación que puedas tener con un contacto"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -1350,7 +1402,7 @@ msgstr ""
 "Gajim mostrará automáticamente los nuevos mensajes recibidos en una ventana "
 "de charla o pestaña en una ventana de chat existente"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -1359,7 +1411,7 @@ msgstr ""
 "Gajim te notificará de nuevos mensajes a través de un mensaje emergente en "
 "la esquina inferior derecha de la pantalla"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1367,7 +1419,7 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se conecte"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1375,13 +1427,19 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se desconecte"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim sólo cambiará el icono del contacto que envía el nuevo mensaje"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -1389,7 +1447,7 @@ msgid ""
 msgstr ""
 "Si está marcado, Gajim mostrará los avatares de los usuarios en el roster"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1398,7 +1456,7 @@ msgstr ""
 "Si está marcado, Gajim mostrará los mensajes de estado de los contactos "
 "debajo de cada nombre en el roster"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1406,7 +1464,7 @@ msgstr ""
 "Si está marcado, Gajim recordará la posición y tamaño de la ventana de "
 "contactos para futuras ejecuciones"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1416,7 +1474,7 @@ msgstr ""
 "un contacto de MSN tendrá el icono de msn equivalente para su estado en "
 "línea, ausente, ocupado, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -1425,12 +1483,12 @@ msgstr ""
 "Si está marcado, Gajim reemplazará emoticonos de texto como ':)' por su "
 "equivalente en iconos"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Gestionar..."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1438,84 +1496,88 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Notificar cuand un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "En cada _mensaje"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid "One message _window:"
 msgstr "Enviar mensaje y cerrar ventana"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Reproducir _sonidos"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Insertar la hora:"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Guarda _posición y tamaño para las ventanas de conversaciones y lista de "
 "contactos"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Sólo mostrar en la _lista de contactos"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "El mensaje de estado de auto-ausencia"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "El mensaje de estado de no auto-no disponible"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "_Usar los iconos del transporte"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Icono en el área de notificación"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -1528,164 +1590,169 @@ msgstr ""
 "nuevo mensaje sólo aparecen cuando proceden de un contacto con el que no se "
 "está hablando ya"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Cuando se reciba un nuevo evento"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Editor avanzado de configurción"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "_After time:"
 msgstr "Después de la hora:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:81
 #, fuzzy
 msgid "_Before time:"
 msgstr "Antes de la hora:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:83
 #, fuzzy
 msgid "_File manager:"
 msgstr "Administrador de archivos:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:84
 #, fuzzy
 msgid "_Font:"
 msgstr "Fuente:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortográficos"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar mensajes de contactos que no están en la lista de contactos"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:87
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Mensaje entrante:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Registrar cambios de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Notificarme"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Mensaje saliente:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Reproductor:"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Emerger"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:96
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Restablecer colores por defecto"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:97
 #, fuzzy
 msgid "_Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:98
 #, fuzzy
 msgid "_Status message:"
 msgstr "Mensaje de estado:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minutos"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Iniciar conversación"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Formato del renglón</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:4
+#: ../data/glade/privacy_list_window.glade.h:4
 msgid "Active for this session"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5
+#: ../data/glade/privacy_list_window.glade.h:5
 #, fuzzy
 msgid "Active on each startup"
 msgstr "C_onectar al inicio de Gajim"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6 ../src/config.py:2355
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "ID de Jabber:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1761
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 msgid "Privacy List"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Subscripción"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "En el grupo"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1693,32 +1760,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Enviar mensaje"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Pregunta para ver su estado"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Permitirle ver mi estado"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Acerca de"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Dirección"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Definir Avatar"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Cumpleaños:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Ciudad:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Compañía:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "País:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Departamento:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Correo-e:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Segunda dirección:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Familia:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Nombre de pila:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Página web:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Medio:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Más"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Información personal"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Teléfono:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Posición:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Código postal:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Prefijo"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Puesto:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Estado:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Calle:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Sufijo:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Trabajo"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Publicar"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Recuperar"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1738,21 +1945,24 @@ msgid "A_sk to see his/her status"
 msgstr "Pregunta para ver su estado"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Notificationes Visuales</b>"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Asignar clave OpenPGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../src/roster_window.py:1621
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Editar grupos"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1579
+#: ../src/roster_window.py:1732
 msgid "In_vite to"
 msgstr ""
 
@@ -1762,6 +1972,7 @@ msgid "Send Single _Message"
 msgstr "Enviar mensaje"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Iniciar conversación"
 
@@ -1776,12 +1987,13 @@ msgid "_Forbid him/her to see my status"
 msgstr "Prohibirle ver mi estado"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1573 ../src/roster_window.py:1719
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Eliminar del Roster"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1707
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "Renombrar"
 
@@ -1810,42 +2022,53 @@ msgid "Help online"
 msgstr "Ayuda online"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Perfil, Avatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transportes"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Mostrar contactos desconectados"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Contenidos"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Descubrir servicios"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1255
-#: ../src/roster_window.py:1699
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr ""
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Salir"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Voz"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "I_r"
@@ -1915,24 +2138,20 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorizar contacto para que pueda saber cuándo estás conectado"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "_Información"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Denegar autorización de contacto para que no pueda saber cuándo estás "
 "conectado"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Petición de adición"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Denegar"
 
@@ -1948,164 +2167,51 @@ msgstr "Mostrar _roster"
 msgid "Sta_tus"
 msgstr "Es_tado"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Acerca de"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Dirección"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Pregunta:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Cumpleaños:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Ciudad:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Compañía:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Información"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "País:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Departamento:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "Correo-e:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Segunda dirección:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Familia:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Nombre de pila:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Página web:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr ""
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Contacto:"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Dirección"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Medio:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Más"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "SO:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Teléfono:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Posición:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Código postal:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Prefijo"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Puesto:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Definir Avatar"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Estado:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Calle:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Subscripción:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Sufijo:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Trabajo"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "Histórico de conversaciones"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Publicar"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Recuperar"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Tráfico de Jabber</b>"
@@ -2137,123 +2243,164 @@ msgstr "_Mensaje"
 msgid "_Presence"
 msgstr "_Presencia"
 
-#: ../src/advanced.py:67
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Nombre:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Nombre:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Información personal"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Modificar cuenta..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Usar nombre de host y puerto personalizados"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Nombre de la opción"
 
-#: ../src/advanced.py:73
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:82
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:138
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Ninguno)"
 
 #. we talk about password
-#: ../src/advanced.py:237
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Oculta"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":"'"$j"'", ; done)
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:48
-msgid "en"
-msgstr "inglés"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "bg"
-msgstr "búlgaro"
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "br"
-msgstr "bretón"
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "cs"
-msgstr "checo"
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "de"
-msgstr "alemán"
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "General"
 
-#: ../src/chat_control.py:48
-msgid "el"
-msgstr "Griego"
+#: ../src/chat_control.py:52
+msgid "Greek"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "eo"
-msgstr "esperanto"
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "es"
-msgstr "español"
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "eu"
-msgstr "euskera"
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "fr"
-msgstr "francés"
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "hr"
-msgstr "croata"
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Dirección"
 
-#: ../src/chat_control.py:48
-msgid "it"
-msgstr "italiano"
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Cursiva"
 
-#: ../src/chat_control.py:48
-msgid "nb"
-msgstr "noruego (2)"
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "nl"
-msgstr "holandés"
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "no"
-msgstr "noruego (of)"
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "pl"
-msgstr "polaco"
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Publicar"
 
-#: ../src/chat_control.py:48
-msgid "pt"
-msgstr "portugués"
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "pt_BR"
-msgstr "portugués (Br)"
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "ru"
-msgstr "ruso"
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "sk"
-msgstr "eslovaco"
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "sv"
-msgstr "sueco"
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
 
-#: ../src/chat_control.py:48
-msgid "zh_CN"
-msgstr "chino (China)"
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:180 ../src/dialogs.py:1424
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2269,62 +2416,63 @@ msgstr ""
 "\n"
 "El resalto de palabras mal escritas no será usado"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:208 ../src/chat_control.py:445
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/chat_control.py:209 ../src/chat_control.py:446
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Tu mensaje no será enviado mientras no estés conectado."
 
-#: ../src/chat_control.py:342
-msgid "Spelling language"
-msgstr ""
-
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:834
 #, fuzzy
 msgid "Chats"
 msgstr "Charla"
 
-#: ../src/chat_control.py:959
-#, python-format
-msgid "%s from room %s"
-msgstr ""
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s en el salón %(room_name)s te ha enviado un nuevo mensaje"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1040
+#: ../src/chat_control.py:1107
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s no ha revelado su clave OpenPGP ni tú le has asignado una"
 
-#: ../src/chat_control.py:1166
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Encriptación activada"
 
-#: ../src/chat_control.py:1171
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Encriptación desactivada"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1299 ../src/conversation_textview.py:475
-#: ../src/dialogs.py:604 ../src/gajim.py:657 ../src/gajim.py:658
-#: ../src/gajim.py:983 ../src/roster_window.py:285
-#: ../src/roster_window.py:1448 ../src/roster_window.py:1882
-#: ../src/roster_window.py:2083 ../src/roster_window.py:2094
-#: ../src/roster_window.py:2416 ../src/roster_window.py:2472
-#: ../src/roster_window.py:3277 ../src/roster_window.py:3279
-#: ../src/common/helpers.py:40 ../src/common/helpers.py:242
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "no está en el roster"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1443
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:1444
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2332,286 +2480,322 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: ../src/config.py:121 ../src/config.py:541
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:200
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Cada %s _minutos"
 
-#: ../src/config.py:335
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Activo"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:940
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "No hay disponible una conexión"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: ../src/config.py:940
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
-#: ../src/config.py:975
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:976
+#: ../src/config.py:1029
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nuevo mensaje"
 
-#: ../src/config.py:977
+#: ../src/config.py:1030
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nombre de contacto"
 
-#: ../src/config.py:978
+#: ../src/config.py:1031
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto conectado"
 
-#: ../src/config.py:979
+#: ../src/config.py:1032
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensaje"
 
-#: ../src/config.py:980
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:981
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1171
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "GPG no es usable en este ordenador"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1217 ../src/config.py:1784
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1218
+#: ../src/config.py:1285
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1222
+#: ../src/config.py:1289
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:1223
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1227 ../src/config.py:1231
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1228
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1232
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1240 ../src/config.py:1246 ../src/config.py:1255
-#: ../src/config.py:2736
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/config.py:1247
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Una ID de Jabber debe estar en la forma \"usuario@nombreservidor\"."
 
-#: ../src/config.py:1303
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:1304
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1438
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1439
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1465
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:1466
+#: ../src/config.py:1534
 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:1472 ../src/dialogs.py:1051 ../src/dialogs.py:1229
-#: ../src/disco.py:411 ../src/vcard.py:462 ../src/vcard.py:495
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: ../src/config.py:1473
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sin una conexión, no puedes editar tu información personal"
 
-#: ../src/config.py:1477
+#: ../src/config.py:1545
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1478
+#: ../src/config.py:1546
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr "Debes crear una cuenta antes de editar tu información personal"
 
-#: ../src/config.py:1502
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:1503
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:1506
+#: ../src/config.py:1574 ../src/config.py:3330
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptación OpenPGP"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1736 ../src/disco.py:727 ../src/disco.py:1469
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1739
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1785
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1982
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "No tienes cuentas activas"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "El nombre de la cuenta está en uso"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:1984
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
-#: ../src/config.py:2055
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2056
+#: ../src/config.py:2259
 #, fuzzy
 msgid "Member List"
 msgstr "_Miembro"
 
-#: ../src/config.py:2057
+#: ../src/config.py:2260
 #, fuzzy
 msgid "Owner List"
 msgstr "_Propietario"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2261
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2091 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr ""
 
-#: ../src/config.py:2099
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2104
+#: ../src/config.py:2307
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2108
+#: ../src/config.py:2311
 #, fuzzy
 msgid "Role"
 msgstr "Puesto:"
 
-#: ../src/config.py:2129
+#: ../src/config.py:2332
 #, fuzzy
 msgid "Banning..."
 msgstr "Expulsando a %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2131
+#: ../src/config.py:2334
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2134
+#: ../src/config.py:2337
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2136
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2137
+#: ../src/config.py:2340
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2139
+#: ../src/config.py:2342
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2140
+#: ../src/config.py:2343
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2141
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2621,91 +2805,92 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2238
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2255 ../src/roster_window.py:2147
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2256 ../src/roster_window.py:2148
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2257 ../src/roster_window.py:2149
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2270
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2271
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Si la eliminas, se perderá la conexión con el servidor"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2426
-msgid "New Room"
-msgstr "Nuevo salón"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Grupos de charla"
 
-#: ../src/config.py:2457
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:2458
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, asegúrate de rellenar los campos de servidor y salón o elimina "
 "este marcador."
 
-#: ../src/config.py:2712
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:2722 ../src/dialogs.py:1248
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/config.py:2723
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Debes introducir una contraseña para la nueva cuenta"
 
-#: ../src/config.py:2727 ../src/dialogs.py:1253
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/config.py:2728 ../src/dialogs.py:1254
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
 
-#: ../src/config.py:2747
+#: ../src/config.py:2963
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2964
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/config.py:2765
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:2766 ../src/config.py:2799
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2714,23 +2899,23 @@ msgstr ""
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:2798
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con éxito"
 
-#: ../src/config.py:2814
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:2871
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:2872
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/conversation_textview.py:272
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2738,518 +2923,518 @@ msgstr ""
 "El texto bajo esta línea es lo que ha sido dicho desde la última vez que "
 "prestaste atención a este salón de charla"
 
-#: ../src/conversation_textview.py:331
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:343
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/conversation_textview.py:348
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:364
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" en la URL del Diccionario y no está en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:376
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" en la URL de la búsqueda web"
 
-#: ../src/conversation_textview.py:379
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:675
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:679
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "hace %i días"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "Los enlaces D-Bus de python no se encuentran en este ordenador"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Las capacidades D-Bus de Gajim no pueden ser usadas"
-
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:58
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nombre del contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:59
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#: ../src/dialogs.py:204
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "En el grupo"
 
-#: ../src/dialogs.py:261
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:264
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/dialogs.py:300
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: ../src/dialogs.py:375
+#: ../src/dialogs.py:393
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Mensajes de estado predefinidos</b>"
 
-#: ../src/dialogs.py:376
+#: ../src/dialogs.py:394
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escribe tu nuevo mensaje de estado:"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:415
 #, fuzzy
-msgid "Jabber ID"
-msgstr "ID de Jabber:"
-
-#: ../src/dialogs.py:397
-#, fuzzy
-msgid "AIM Address"
+msgid "AIM Address:"
 msgstr "Dirección"
 
-#: ../src/dialogs.py:398
-msgid "GG Number"
+#: ../src/dialogs.py:416
+msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:399
-msgid "ICQ Number"
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:400
+#: ../src/dialogs.py:418
 #, fuzzy
-msgid "MSN Address"
+msgid "MSN Address:"
 msgstr "Dirección"
 
-#: ../src/dialogs.py:401
+#: ../src/dialogs.py:419
 #, fuzzy
-msgid "Yahoo! Address"
+msgid "Yahoo! Address:"
 msgstr "Dirección"
 
-#: ../src/dialogs.py:436
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, introduce la inforamción del contacto que quieres añadir a la "
 "cuenta %s"
 
-#: ../src/dialogs.py:438
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, rellena la información del contacto que quieres añadir"
 
-#: ../src/dialogs.py:446 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1252 ../src/roster_window.py:216
-#: ../src/roster_window.py:282 ../src/roster_window.py:318
-#: ../src/roster_window.py:370 ../src/roster_window.py:397
-#: ../src/roster_window.py:3273 ../src/roster_window.py:3275
-#: ../src/common/helpers.py:40
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/dialogs.py:584 ../src/dialogs.py:590
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "ID de Usuario no válida"
 
-#: ../src/dialogs.py:591
+#: ../src/dialogs.py:614
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/dialogs.py:605
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: ../src/dialogs.py:606
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/dialogs.py:638
+#: ../src/dialogs.py:663
 #, fuzzy
-msgid "User ID"
+msgid "User ID:"
 msgstr "Identificador:"
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:694
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:702
+#: ../src/dialogs.py:730
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:708
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:714
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr "Membris Khan <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:854
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "No se pudo entrar al salón"
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:997
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Petición de adición para la cuenta %s de %s"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:1044 ../src/roster_window.py:590
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
 #, python-format
 msgid "You are already in room %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "No puedes entrar a un salón de chat hasta que no estés conectado."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un salón de chat con la cuenta %s"
 
-#: ../src/dialogs.py:1158
+#: ../src/dialogs.py:1184
 #, fuzzy
-msgid "Invalid room or server name"
-msgstr "Nombre de usuario no válido"
+msgid "Invalid room Jabber ID"
+msgstr "ID de Jabber no válida"
 
-#: ../src/dialogs.py:1159
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+msgid "The room Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/dialogs.py:1182
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/dialogs.py:1183
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Introduce la ID del contacto al que quieres enviar\n"
 "un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1208 ../src/dialogs.py:1562 ../src/dialogs.py:1686
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:1209 ../src/dialogs.py:1563 ../src/dialogs.py:1687
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:1218 ../src/dialogs.py:1221
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/dialogs.py:1221
+#: ../src/dialogs.py:1249
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "No se puede escribir el archivo en %s"
 
-#: ../src/dialogs.py:1230
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1295 ../src/notify.py:194 ../src/notify.py:355
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:1297 ../src/notify.py:202 ../src/notify.py:357
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#: ../src/dialogs.py:1299 ../src/notify.py:221 ../src/notify.py:359
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #. single message
-#: ../src/dialogs.py:1299 ../src/notify.py:206 ../src/notify.py:359
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
 #. private message
-#: ../src/dialogs.py:1300 ../src/notify.py:213 ../src/notify.py:360
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:1300 ../src/gajim.py:1072 ../src/notify.py:368
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 #, fuzzy
 msgid "New E-mail"
 msgstr "Correo-e"
 
-#: ../src/dialogs.py:1302 ../src/gajim.py:1215 ../src/notify.py:362
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/dialogs.py:1304 ../src/gajim.py:1050 ../src/gajim.py:1192
-#: ../src/notify.py:364
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:1306 ../src/gajim.py:1250 ../src/gajim.py:1272
-#: ../src/gajim.py:1289 ../src/notify.py:366
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:1307 ../src/gajim.py:1253 ../src/notify.py:366
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:1309 ../src/gajim.py:948 ../src/notify.py:370
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "Ninguno"
 
-#: ../src/dialogs.py:1311 ../src/notify.py:186 ../src/notify.py:372
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto desconectado"
 
-#: ../src/dialogs.py:1492
+#: ../src/dialogs.py:1521
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:1494
+#: ../src/dialogs.py:1523
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:1496
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1522
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1589
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1590
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: ../src/dialogs.py:1634
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1636
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1755
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1759
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1851
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Descripción: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato del renglón</b>"
 
-#: ../src/dialogs.py:1936
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato del renglón</b>"
 
-#: ../src/dialogs.py:2033
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2035
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar conversación"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2124
+#: ../src/dialogs.py:2155
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s invitado a %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2130
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:2193
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:2203 ../src/dialogs.py:2248
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:2208
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:2253
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/dialogs.py:2298
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:2300
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:2371
+#: ../src/dialogs.py:2413
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2377
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Conexión"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2540
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:108
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:412
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexión no puedes navegar los servicios disponibles"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestión de servicios usando la cuenta %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "El servicio no fue encontrado"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3257,46 +3442,51 @@ msgstr ""
 "No hay servicio en la dirección introducida, o no está respondiendo. "
 "Comprueba la dirección e inténtalo de nuevo."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "El servicio no es navegable"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de servicio no contiene ningún elemento a navegar."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "usando la cuenta %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/disco.py:1137 ../src/disco.py:1257
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1294
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Descripción"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Archivo"
@@ -3314,7 +3504,7 @@ msgstr "Progreso"
 msgid "Filename: %s"
 msgstr "Nombre de archivo: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %s"
@@ -3322,7 +3512,7 @@ msgstr "Tamaño: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Tú"
 
@@ -3331,8 +3521,8 @@ msgstr "Tú"
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Recipiente: "
 
@@ -3358,79 +3548,84 @@ msgstr "La conexión con el cliente no se pudo establecer."
 msgid "Recipient: %s"
 msgstr "Recipiente: "
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Introduce tu mensaje:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Transferencia de archivo detenida por el contacto de la otra parte"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Elige archivo a enviar..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim no puede acceder a este archivo"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Este archivo está siendo usado por otro proceso."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Archivo: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quiere enviarte un archivo:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Este archivo ya existe"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Guardar archivo como..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
@@ -3438,58 +3633,259 @@ msgstr ""
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr ""
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Archivo no válido"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Archivo: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "No es posible enviar archivos vacíos"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim necesita Xserver para funcionar. Abortando..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim necesita PyGTK 2.6 o superior"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim necesita PyGTK 2.6 o superior para funcionar. Abortando..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim necesita GTK 2.6 o superior"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim necesita GTK 2.6 o superior para funcionar. Abortando..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "La biblioteca GTK+ necesita soporte de libglade"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Por favor elimina tu actual biblioteca GTK+ e instala la última versión "
+"estable desde %s"
+
+#: ../src/gajim.py:65
+#, fuzzy
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Por favor, asegúrate de que gtk y pygtk tienen soporte de libglade en este "
+"sistema."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim necesita PySQLite2 para funcionar"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim necesita PySQLite2 para funcionar"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "Autorización HTTP (%s) para %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "¿Aceptas esta petición?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Conexión"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Tema: %s\n"
+
+#: ../src/gajim.py:654
+#, fuzzy, python-format
+msgid "error while sending %s ( %s )"
+msgstr "error durante el envío"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Autorización aceptada"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "El contacto \"%s\" eliminó su subscripción de tí"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Siempre le verás desconectado."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "No se ha podido establecer contacto con \"%s\""
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Comprueba tu conexión o reinténtalo más tarde."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s está ahora %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Contraseña incorrecta"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Estás actualmente conectado sin tu clave GPG"
+
+#: ../src/gajim.py:1084
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Tienes mensajes sin leer"
+msgstr[1] "Tienes mensajes sin leer"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s quiere enviarte un archivo."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Has recibido con éxito el archivo %(filename)s de %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Has enviado con éxito el archivo %(filename)s a %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Transferencia de %(filename)s a %(name)s detenida."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Por favor, introduce los datos para tu nueva cuenta</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "No se pueden guardar las preferencias"
+
+#: ../src/gajim.py:1998
+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-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "muestra ayuda sobre un comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "mostrar ayuda sobre un comando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Muestra u oculta la ventana de la lista de contactos"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Levanta una venana con el siguiente mensaje sin leer"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3497,48 +3893,48 @@ msgstr ""
 "Muestra una lista de todos los contactos en el roster. Cada contacto aparece "
 "en una línea distinta"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "cuenta"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "mostrar sólo contactos de la cuenta especificada"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Muestra una lista de cuentas registradas"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Cambia el estado de una o varias cuentas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
 "ocupado, invisible"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "mensaje"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "ensaje de estado"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3547,19 +3943,19 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Muestra el diálogo de conversación para enviar mensajes a un contacto"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contacto con el que quieres conversar"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "si es especificado, el contacto es obtenido de la lista de esta cuenta"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3570,27 +3966,27 @@ msgstr ""
 "clave OpenPGP como la cuenta son opcionales. Si quieres definir sólo "
 "'cuenta' sin 'clave pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "la JID del contacto que recibirá el mensaje"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "contenido del mensaje"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "clave pgp"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "si es especificado, el mensaje será encriptado usando su clave pública"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "si es especificado el mensaje será enviado a través de esta cuenta"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3601,132 +3997,147 @@ msgstr ""
 "clave OpenPGP como la cuenta son opcionales. Si quieres definir sólo "
 "'cuenta' sin 'clave pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Tema:"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Mensaje"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Obtener información detallada de un contacto"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID del contacto"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Obtener información detallada de un contacto"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 #, fuzzy
 msgid "Name of the account"
 msgstr "No tienes cuentas activas"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "archivo"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "si es especificado el archivo será enviado usando esta cuenta"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Lista todas las preferencias y sus valores"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define el valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'entrada' es el nombre de la preferencia, 'valor' es el valor a definir"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "nombre de la preferencia a eliminar"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe el estado actual de la preferencias de Gajim al archivo de "
 "configuración"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Elimina contacto del roster"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Añade contacto al roster"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Añade nuevo contacto a esta cuenta."
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devuelve el estado actual (el global si no se especifica una cuenta)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "Devuelve el estado actual (el global si no se especifica una cuenta)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "Consola XML"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3735,16 +4146,11 @@ msgstr ""
 "'%s' no está en tu lista de contactos.\n"
 "Por favor, especifica una cuenta para enviar el mensaje."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "No tienes cuentas activas"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Versión de D-Bus desconocida: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3753,16 +4159,16 @@ msgstr ""
 "Modo de uso: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s no encontrado"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3771,7 +4177,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando es uno de:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3780,199 +4186,6 @@ msgstr ""
 "El argumento \"%s\" no se ha especificado. \n"
 "Escribe \"%s help %s\" para más información"
 
-#: ../src/gajim.py:56
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim necesita Xserver para funcionar. Abortando..."
-
-#: ../src/gajim.py:60
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim necesita PyGTK 2.6 o superior"
-
-#: ../src/gajim.py:61
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim necesita PyGTK 2.6 o superior para funcionar. Abortando..."
-
-#: ../src/gajim.py:63
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim necesita GTK 2.6 o superior"
-
-#: ../src/gajim.py:64
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim necesita GTK 2.6 o superior para funcionar. Abortando..."
-
-#: ../src/gajim.py:69
-msgid "GTK+ runtime is missing libglade support"
-msgstr "La biblioteca GTK+ necesita soporte de libglade"
-
-#: ../src/gajim.py:71
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Por favor elimina tu actual biblioteca GTK+ e instala la última versión "
-"estable desde %s"
-
-#: ../src/gajim.py:73
-#, fuzzy
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Por favor, asegúrate de que gtk y pygtk tienen soporte de libglade en este "
-"sistema."
-
-#: ../src/gajim.py:78
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim necesita PySQLite2 para funcionar"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:159
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:160
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:261
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Autorización HTTP (%s) para %s (id: %s)"
-
-#: ../src/gajim.py:262
-msgid "Do you accept this request?"
-msgstr "¿Aceptas esta petición?"
-
-#: ../src/gajim.py:590
-#, fuzzy, python-format
-msgid "Subject: %s"
-msgstr "Tema: %s\n"
-
-#: ../src/gajim.py:633
-#, fuzzy, python-format
-msgid "error while sending %s ( %s )"
-msgstr "error durante el envío"
-
-#: ../src/gajim.py:673
-msgid "Authorization accepted"
-msgstr "Autorización aceptada"
-
-#: ../src/gajim.py:674
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
-
-#: ../src/gajim.py:682
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "El contacto \"%s\" eliminó su subscripción de tí"
-
-#: ../src/gajim.py:683
-msgid "You will always see him or her as offline."
-msgstr "Siempre le verás desconectado."
-
-#: ../src/gajim.py:726
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "No se ha podido establecer contacto con \"%s\""
-
-#: ../src/gajim.py:727 ../src/common/connection.py:402
-msgid "Check your connection or try again later."
-msgstr "Comprueba tu conexión o reinténtalo más tarde."
-
-#: ../src/gajim.py:871 ../src/roster_window.py:1084
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s está ahora %s (%s)"
-
-#: ../src/gajim.py:958
-msgid "Your passphrase is incorrect"
-msgstr "Contraseña incorrecta"
-
-#: ../src/gajim.py:959
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Estás actualmente conectado sin tu clave GPG"
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1061
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1063
-#, fuzzy, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Tienes mensajes sin leer"
-msgstr[1] "Tienes mensajes sin leer"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1068
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1213
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s quiere enviarte un archivo."
-
-#: ../src/gajim.py:1273
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Has recibido con éxito el archivo %(filename)s de %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1277
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
-
-#: ../src/gajim.py:1290
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Has enviado con éxito el archivo %(filename)s a %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1294
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Transferencia de %(filename)s a %(name)s detenida."
-
-#: ../src/gajim.py:1323
-msgid "vCard publication succeeded"
-msgstr "vCard publicada con éxito"
-
-#: ../src/gajim.py:1323
-msgid "Your personal information has been published successfully."
-msgstr "Tu información personal ha sido publicada con éxito"
-
-#: ../src/gajim.py:1332
-msgid "vCard publication failed"
-msgstr "falló la publicación de la vCard"
-
-#: ../src/gajim.py:1332
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
-"nuevo más tarde."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1711
-msgid "Could not save your settings and preferences"
-msgstr "No se pueden guardar las preferencias"
-
-#: ../src/gajim.py:1935
-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_themes_window.py:60
 msgid "Theme"
 msgstr "Tema"
@@ -3990,120 +4203,120 @@ msgstr "No puedes eliminar el tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 #, fuzzy
 msgid "Private Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar conversación"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Ya no estás en el salón \"%s\" o \"%s\" ya no existe."
 
-#: ../src/groupchat_control.py:136
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Grupos de charla"
 
-#: ../src/groupchat_control.py:136
+#: ../src/groupchat_control.py:141
 #, fuzzy
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/groupchat_control.py:307
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cambiar _Alias"
 
-#: ../src/groupchat_control.py:649
-msgid "This room has no subject"
-msgstr "Este salón no tiene tema"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:748
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:752
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:759
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:763
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:771
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_control.py:773
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s es ahora conocido como %s"
 
-#: ../src/groupchat_control.py:850
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_control.py:855
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:857 ../src/roster_window.py:1087
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s está ahora %s"
 
-#: ../src/groupchat_control.py:975 ../src/groupchat_control.py:993
-#: ../src/groupchat_control.py:1086 ../src/groupchat_control.py:1102
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alias no encontrado: %s"
 
-#: ../src/groupchat_control.py:1020
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Este salón no tiene tema"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s invitado a %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1027 ../src/groupchat_control.py:1057
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s no parece ser un JID válido"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1181
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "No existe el comando: /%s (si quieres enviar este prefijo con /say)"
 
-#: ../src/groupchat_control.py:1161
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -4116,7 +4329,7 @@ msgstr ""
 "actualmente en el salón, el/ella puede ser también expulsado. NO soporta "
 "espacio en el alias."
 
-#: ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4124,12 +4337,12 @@ msgstr ""
 "Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1173
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpia de texto la ventana."
 
-#: ../src/groupchat_control.py:1175
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4138,12 +4351,12 @@ msgstr ""
 "Uso: /%s [motivo], cierra la ventana o pestaña actual, mostrando el motivo "
 "si se especifica."
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1221
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, limpia de texto la ventana."
 
-#: ../src/groupchat_control.py:1180
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -4152,7 +4365,7 @@ msgstr ""
 "Uso: /%s <JID> [reason], invita al JID al salón actual, opcionalmente "
 "proveyendo un motivo."
 
-#: ../src/groupchat_control.py:1184
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4161,7 +4374,7 @@ msgstr ""
 "Uso: /%s <salón>@<servidor>[/alias], ofrece la entrada a salón@servidor "
 "opcionalmente usando el alias especificado"
 
-#: ../src/groupchat_control.py:1188
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4171,7 +4384,7 @@ msgstr ""
 "Uso: /%s <alias> [motivo], elimina del salón al ocupante especificado por el "
 "alias y opcionalmente muestra un motivo. NO soporta espacios en el alias."
 
-#: ../src/groupchat_control.py:1193
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -4180,7 +4393,7 @@ msgstr ""
 "Uso: /%s <acción>, envía una acción al salón actual. Usa la tercera persona. "
 "(p.ej. /%s grita.)"
 
-#: ../src/groupchat_control.py:1197
+#: ../src/groupchat_control.py:1241
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4189,100 +4402,100 @@ msgstr ""
 "Uso: /%s <alias> [message], abre una ventana de conversación privada y envía "
 "un mensaje al ocupante especificado por el alias."
 
-#: ../src/groupchat_control.py:1202
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Uso: /%s <alias>, cambia tu alias en el salón actual."
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salón."
 
-#: ../src/groupchat_control.py:1210
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salón."
 
-#: ../src/groupchat_control.py:1213
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Uso: /%s <mensaje>, envía un mensaje sin buscar otros comandos."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "No hay información de ayuda para /%s"
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "¿Estás seguro de querer abandonar el salón \"%s\"?"
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Si cierras esta ventana, serás desconectado de este salón."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1314
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_No preguntarme otra vez"
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1306
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1307
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
-#: ../src/groupchat_control.py:1333
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Marcador ya definido"
 
-#: ../src/groupchat_control.py:1334
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "El salón \"%s\" ya se encuentra en tus marcadores."
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Marcador añadido con éxito"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Puedes gestionar tus marcadores mediante el menú Acciones de tu roster"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1454
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:1455 ../src/groupchat_control.py:1733
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1732
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Ha sido detectado un error de programación"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4290,92 +4503,92 @@ msgstr ""
 "Probablemente no es crítico, pero no obstante debe ser informado a los "
 "desarrolladores."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Informar de fallo"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Detalles"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Error leyendo el archivo:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Error analizando el archivo:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "No se puede escribir en %s. El soporte de manejo de sesión no funcionará"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar archivo como..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "creando base de datos de registros"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 #, fuzzy
 msgid "Contacts"
 msgstr "Contacto:"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Fecha"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 #, fuzzy
 msgid "Nickname"
 msgstr "Alias:"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Mensaje"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 #, fuzzy
 msgid "Subject"
 msgstr "Tema:"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4384,125 +4597,176 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Migrando el registro..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de conversaciones con %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está ahora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:181
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está ahora %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: ../src/message_window.py:254
+#: ../src/message_window.py:271
 #, fuzzy
 msgid "Messages"
 msgstr "Mensaje"
 
-#: ../src/message_window.py:255
+#: ../src/message_window.py:272
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:179
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s está ahora %(status)s"
 
-#: ../src/notify.py:189
+#: ../src/notify.py:206
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/notify.py:197
+#: ../src/notify.py:214
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contacto desconectado"
 
-#: ../src/notify.py:209
+#: ../src/notify.py:226
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuevo mensaje"
 
-#: ../src/notify.py:217
+#: ../src/notify.py:234
 #, fuzzy, python-format
-msgid "New Private Message from room %s"
+msgid "New Private Message from group chat %s"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/notify.py:218
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:224
+#: ../src/notify.py:241
 #, fuzzy, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuevo mensaje como %s "
 
-#: ../src/roster_window.py:137
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr ""
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Invitación recibida"
+
+#: ../src/profile_window.py:315
+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/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "falló la publicación de la vCard"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
+"nuevo más tarde."
+
+#: ../src/profile_window.py:381
+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/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:297 ../src/common/helpers.py:40
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: ../src/roster_window.py:594 ../src/roster_window.py:2574
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "No puedes entrar a un salón de chat estando invisible"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:793
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
 #. disco
-#: ../src/roster_window.py:798
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
@@ -4510,54 +4774,65 @@ msgstr "usando la cuenta %s"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:804 ../src/systray.py:199 ../src/systray.py:204
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:870
+#: ../src/roster_window.py:881
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:890
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Gestionar marcadores..."
 
-#: ../src/roster_window.py:914
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
 #. History manager
-#: ../src/roster_window.py:935
+#: ../src/roster_window.py:951
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: ../src/roster_window.py:944
-msgid "_Join New Room"
-msgstr "_Entrar en un nuevo salón"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "_Entrar a un grupo de charla"
+
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Tienes mensajes sin leer"
+
+#: ../src/roster_window.py:1259
+msgid "You must read them before removing this transport."
+msgstr ""
 
-#: ../src/roster_window.py:1223
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:1224
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr ""
 "Ya no podrás enviar y recibir mensajes a contactos desde este transporte"
 
-#: ../src/roster_window.py:1226
+#: ../src/roster_window.py:1265
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:1231
+#: ../src/roster_window.py:1270
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4565,72 +4840,72 @@ msgid ""
 msgstr ""
 "Ya no podrás enviar y recibir mensajes a contactos desde este transporte"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:1276
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:1413 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
 #, fuzzy
 msgid "_New room"
 msgstr "Nuevo salón"
 
-#: ../src/roster_window.py:1471
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Re_nombrar"
 
-#: ../src/roster_window.py:1678
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:1687
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:1782
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:1858
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1859
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1883
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:2106
 #, 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:1895
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido eliminada"
 
-#: ../src/roster_window.py:1896
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:2102
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2329
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -4639,7 +4914,7 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:2110
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4647,17 +4922,17 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:2111
+#: ../src/roster_window.py:2334
 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"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2115
+#: ../src/roster_window.py:2338
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:2119
+#: ../src/roster_window.py:2342
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4666,33 +4941,33 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:2189
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/roster_window.py:2190
+#: ../src/roster_window.py:2412
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Introduce contraseña GPG para la cuenta %s"
 
-#: ../src/roster_window.py:2195
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Guardar contraseña"
 
-#: ../src/roster_window.py:2203
+#: ../src/roster_window.py:2425
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Contraseña"
 
-#: ../src/roster_window.py:2204
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:2256 ../src/roster_window.py:2313
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 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:2257 ../src/roster_window.py:2314
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4700,19 +4975,20 @@ 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:2273
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:2274
+#: ../src/roster_window.py:2496
 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:2746 ../src/roster_window.py:2752
-msgid "You have unread messages"
-msgstr "Tienes mensajes sin leer"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2747 ../src/roster_window.py:2753
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4720,145 +4996,111 @@ msgstr ""
 "Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
 "histórico activado"
 
-#: ../src/roster_window.py:3542
+#: ../src/roster_window.py:3848
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De %s en el salón %s"
 
-#: ../src/roster_window.py:3549
+#: ../src/roster_window.py:3855
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/roster_window.py:3726
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
-#: ../src/systray.py:160
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Cambiar mensaje de estado..."
 
-#: ../src/systray.py:237
-msgid "Hide this menu"
-msgstr "Oculta este menú"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d mensaje sin leer"
-msgstr[1] "Gajim - %d mensajes sin leer"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d mensaje sin leer"
-msgstr[1] "Gajim - %d mensajes sin leer"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d mensaje único sin leer"
-msgstr[1] "Gajim - %d mensajes únicos sin leer"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d mensajes sin leer"
-msgstr[1] "Gajim - %d mensajes sin leer"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d mensaje privado sin leer"
-msgstr[1] "Gajim - %d mensajes privados sin leer"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Rol: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Afiliación: "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Estado: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Subscripción: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Estado: "
+
+#: ../src/tooltips.py:484
 #, fuzzy, python-format
-msgid "Last status on %s"
+msgid "Last status: %s"
 msgstr "_Iconos de estado por defecto:"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:486
 #, fuzzy, python-format
-msgid "Since %s"
-msgstr "Tamaño: %s"
+msgid " since %s"
+msgstr "Navegando %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "ID de Jabber:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Detenido"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Completado"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servicio no ha respondido todavía con información detallada"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4866,25 +5108,25 @@ msgstr ""
 "Este servicio podría no responder con información detallada.\n"
 "Posiblemente es antiguo o está roto"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr ""
-
-#: ../src/vcard.py:291
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:312
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Navegando %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Afiliación: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4892,7 +5134,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:338
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4900,14 +5142,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:340
+#: ../src/vcard.py:269
 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:342
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4915,103 +5157,72 @@ msgstr ""
 "No estás interesado en la presencia del contacto y el/ella tampoco lo está "
 "en el tuyuo"
 
-#: ../src/vcard.py:351
+#: ../src/vcard.py:279
 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:363 ../src/vcard.py:386
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
-#: ../src/vcard.py:463
-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:496
-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:500
-#, fuzzy
-msgid "Personal details"
-msgstr "Información personal"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "creando base de datos de registros"
 
-#: ../src/common/check_paths.py:87 ../src/common/check_paths.py:98
-#: ../src/common/check_paths.py:105
+#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s es un archivo pero podría ser un directorio"
 
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:99
-#: ../src/common/check_paths.py:106 ../src/common/check_paths.py:114
+#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
 msgid "Gajim will now exit"
 msgstr "Gajim se cerrará ahora"
 
-#: ../src/common/check_paths.py:113
+#: ../src/common/check_paths.py:108
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s es un directorio pero podría ser un archivo"
 
-#: ../src/common/check_paths.py:129
+#: ../src/common/check_paths.py:124
 #, python-format
 msgid "creating %s directory"
 msgstr "creando directorio %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Servicio no disponible: Gajim no está ejecutándose, o remote_control está en "
-"False"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus no está presente en esta máquina o falta el módulo python"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus o el demonio notificador para mostrar notificaciones"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tiempo en minutos, después de haber cambiado a ausente"
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Ausente por inactividad"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tiempo en minutos, después de haber cambiado a no disponible"
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "No disponible por inactividad"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:83
-msgid "Language used by speller"
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "Languages available in speller"
+msgid "Language used by speller"
 msgstr ""
 
 #: ../src/common/config.py:89
@@ -5023,8 +5234,9 @@ msgstr ""
 
 #: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -5038,23 +5250,29 @@ msgstr ""
 "Si es True, no elimiina */_ . Entonces *abc* será negrita, pero sin eliminar "
 "* *"
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "¿Añadir * y [n] en el título del roster?"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5062,12 +5280,12 @@ msgstr ""
 "Cuántas líneas recordar de la última conversación cuando se vuelve a abrir "
 "una pestaña/ventana de conversación"
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Cuántos minutos debe durar la última línea de la conversación anterior."
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5075,11 +5293,11 @@ msgstr ""
 "Envía un mensaje con Ctrl+Intro y con Intro hace un nuevo renglón (Al estilo "
 "del cliente Mirabilis ICQ)"
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Cuántas líneas almacenar para Ctrl+Arriba."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5088,36 +5306,36 @@ msgstr ""
 "URL personalizada con %s donde %s es la palabra/frase o 'WIKTIONARY' que "
 "significa usar wiktionary"
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si está marcado, Gajim puede ser controlado remotamente usando gajim-remote."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:156
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:157
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5125,24 +5343,24 @@ msgstr ""
 "Se elimina el host que enviamos para la transferencia de un archivo en caso "
 "de traducción de la dirección o redirección de puertos."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Según el estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "¿Mostrar pestaña cuando sólo hay una conversación?"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "¿Mostrar borde de la pestaña cuando sólo hay una conversación?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "¿Mostrar botón de cerrar en la pestaña?"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -5150,7 +5368,7 @@ msgstr ""
 "Una lista de palabras separadas por ';' que serán resaltadas en las "
 "conversaciones de varios usuarios."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5159,11 +5377,11 @@ msgstr ""
 "pulsado. Esta preferencia sólo se activa si se usa el icono del área de "
 "notificación. "
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Si es True, Gajim registra xmpp:// en cada inicio."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5171,15 +5389,16 @@ msgstr ""
 "Si es True, Gajim mostrará un icono en cada pestaña que contenga mensajes "
 "sin leer. Dependiendo del tema, este icono puede ser animado."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Si es True, Gajim mostrará el mensaje de estado, si no está vacío, para cada "
 "contacto bajo su nombre en la lista de contactos."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -5187,7 +5406,7 @@ msgstr ""
 "Si es True, Gajim pedirá un avatar a cada contacto que no tuvo un avatar la "
 "última vez o se tiene guardado uno demasiado antiguo."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5196,39 +5415,43 @@ msgstr ""
 "Si es False, no verás más la línea de estado en las conversaciones cuando un "
 "contacto cambia su estado y/o su mensaje de estado."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:201
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:201
+#: ../src/common/config.py:204
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5236,161 +5459,175 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 
-#: ../src/common/config.py:202
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:207
 #, fuzzy
-msgid "Hides the buttons in group chat window"
+msgid "Hides the buttons in group chat window."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:205
-msgid "Hides the buttons in two persons chat window"
-msgstr ""
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
+msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:209
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:208
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
+msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
+
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:209
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:210
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:211
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:212
-msgid "Ctrl-Tab go to next composing tab when none is unread"
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:245
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:310
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "GPG no es usable en este ordenador"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:328
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:312 ../src/common/config.py:314
-#: ../src/common/config.py:315 ../src/common/config.py:318
-#: ../src/common/config.py:319
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:331
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Estoy disfrutando la vida"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:352
 #, fuzzy
-msgid "I'm avavilable"
+msgid "I'm available."
 msgstr "En línea"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:353
 #, fuzzy
-msgid "I'm free for chat"
+msgid "I'm free for chat."
 msgstr "Libre para hablar"
 
-#: ../src/common/config.py:337
-msgid "Be right back"
-msgstr ""
-
-#: ../src/common/config.py:338
+#: ../src/common/config.py:355
 #, fuzzy
-msgid "I'm not available"
+msgid "I'm not available."
 msgstr "Servicio no disponible"
 
-#: ../src/common/config.py:339
-msgid "Do not disturb"
+#: ../src/common/config.py:356
+msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:340 ../src/common/config.py:341
+#: ../src/common/config.py:357 ../src/common/config.py:358
 #, fuzzy
-msgid "Bye !"
+msgid "Bye!"
 msgstr "Ocupado"
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5398,7 +5635,7 @@ msgstr ""
 "Sonido a reproducir cuando un mensaje MUC contiene una de las palabras "
 "listadas en muc_highlight_words, o cuando un mensaje MUC contiene tu alias."
 
-#: ../src/common/config.py:351
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5406,99 +5643,211 @@ msgstr ""
 "Sonido a reproducir cuando se recibe cualquier mensaje MUC. (Esta "
 "preferencia sólo se activa si notify_on_all_muc_messages es False)"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:188
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:363 ../src/common/optparser.py:174
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:384
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:371
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr ""
 
-#: ../src/common/connection.py:176
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "No se pudo entrar al salón"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Contraseña"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "La información de registro para el transporte %s no llegó a tiempo"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Alias no encontrado: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "No se pudo entrar al salón"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Se requiere una contraseña para entrar a este salón"
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Estás expulsado de este salón"
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "No existe el salón."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "La creación de salones está restringida."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Es necesario usar el alias registrado."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "No estás en la lista de miembros"
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Tu alias deseado está en uso o registrado por otro ocupante. \n"
+"Por favor, especifica otro alias abajo:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Me gustaría añadirte a mi lista de contactos"
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "estamos ahora suscritos a %s"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "petición de eliminación de suscripción de %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "ya no estamos suscritos a %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"El Jid %s no cumple la norma RFC. No será añadido a tu roster. Usa "
+"herramientas de gestión del roster como http://jru.jabberstudio.org/ para "
+"eliminarlo"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Se ha perdido la conexión de la cuenta \"%s\""
 
-#: ../src/common/connection.py:177
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar enviando y reciviendo mensajes, necesitarás volver a conectar."
 
-#: ../src/common/connection.py:189 ../src/common/connection.py:215
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:214
+#: ../src/common/connection.py:200
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Contraseña no válida"
 
-#: ../src/common/connection.py:401 ../src/common/connection.py:437
-#: ../src/common/connection.py:860
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: ../src/common/connection.py:415
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado al servidor %s:%s con %s"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexión o inténtalo más tarde"
 
-#: ../src/common/connection.py:463
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprueba que tu nombre de usuario y contraseña sean correctos."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:577
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "No se ha facilitado la clave OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:579
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Te conectarás a %s sin OpenPGP"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:616
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "invisible"
 
-#: ../src/common/connection.py:617
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "desconectado"
 
-#: ../src/common/connection.py:618
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Estoy %s"
 
 #. we're not english
-#: ../src/common/connection.py:703
-msgid "[This message is encrypted]"
+#. one  in locale and one en
+#: ../src/common/connection.py:699
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Este mensaje está encriptado]"
 
-#: ../src/common/connection.py:746
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5507,312 +5856,597 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:885
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:51
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Los enlaces D-Bus de python no se encuentran en este ordenador"
+
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Las capacidades D-Bus de Gajim no pueden ser usadas"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Servicio no disponible: Gajim no está ejecutándose, o remote_control está en "
+"False"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus no está presente en esta máquina o falta el módulo python"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "No se pudo entrar al salón"
+msgid "one"
+msgstr "Ninguno"
 
-#: ../src/common/connection_handlers.py:176
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "Wrong host"
-msgstr "Contraseña"
+msgid "three"
+msgstr "Calle:"
 
-#: ../src/common/connection_handlers.py:176
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Puerto: "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "archivo"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:588
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Evento"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Continuar"
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "ten"
+msgstr "inglés"
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Eliminar MOTD"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "La información de registro para el transporte %s no llegó a tiempo"
+msgid "%0 o'clock"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1438
-#, fuzzy, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Alias no encontrado: %s"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1507
-#: ../src/common/connection_handlers.py:1510
-#: ../src/common/connection_handlers.py:1513
-#: ../src/common/connection_handlers.py:1516
-#: ../src/common/connection_handlers.py:1519
-#: ../src/common/connection_handlers.py:1522
-#: ../src/common/connection_handlers.py:1530
-msgid "Unable to join room"
-msgstr "No se pudo entrar al salón"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1508
-msgid "A password is required to join this room."
-msgstr "Se requiere una contraseña para entrar a este salón"
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1511
-msgid "You are banned from this room."
-msgstr "Estás expulsado de este salón"
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1514
-msgid "Such room does not exist."
-msgstr "No existe el salón."
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1517
-msgid "Room creation is restricted."
-msgstr "La creación de salones está restringida."
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1520
-msgid "Your registered nickname must be used."
-msgstr "Es necesario usar el alias registrado."
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
-msgid "You are not in the members list."
-msgstr "No estás en la lista de miembros"
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1531
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
 msgstr ""
-"Tu alias deseado está en uso o registrado por otro ocupante. \n"
-"Por favor, especifica otro alias abajo:"
 
-#: ../src/common/connection_handlers.py:1577
-msgid "I would like to add you to my roster."
-msgstr "Me gustaría añadirte a mi lista de contactos"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Registrar a %s"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1598
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "estamos ahora suscritos a %s"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1600
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "petición de eliminación de suscripción de %s"
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1602
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "ya no estamos suscritos a %s"
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1772
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Trabajando"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Ninguno"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Evento"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
 msgstr ""
-"El Jid %s no cumple la norma RFC. No será añadido a tu roster. Usa "
-"herramientas de gestión del roster como http://jru.jabberstudio.org/ para "
-"eliminarlo"
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Caracter no válido en el nombre de usuario."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Se requiere la dirección del servidor."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Carácter no válido en el nombre del host."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Carácter no válido en el recurso."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr ""
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr ""
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr ""
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "En líne_a"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "En línea"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "Tiene errores"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Salón:"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Ninguno"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Propietario"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrador"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Miembro"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "está escribiendo..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:334
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d mensaje sin leer"
+msgstr[1] "Gajim - %d mensajes sin leer"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d mensaje único sin leer"
+msgstr[1] "Gajim - %d mensajes únicos sin leer"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d mensajes sin leer"
+msgstr[1] "Gajim - %d mensajes sin leer"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d mensaje privado sin leer"
+msgstr[1] "Gajim - %d mensajes privados sin leer"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "error: no se puede abrir %s para lectura"
 
-#: ../src/common/optparser.py:174
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr ""
 
-#: ../src/common/optparser.py:183 ../src/common/optparser.py:184
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr ""
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "creando base de datos de registros"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "para la cuenta %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+msgid "Could not start local service"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "No se puede conectar a \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Este mensaje está encriptado]"
+
+#~ msgid "Contact _Info"
+#~ msgstr "_Información"
+
+#~ msgid "Contact Information"
+#~ msgstr "Información"
+
+#~ msgid "bg"
+#~ msgstr "búlgaro"
+
+#~ msgid "br"
+#~ msgstr "bretón"
+
+#~ msgid "cs"
+#~ msgstr "checo"
+
+#~ msgid "de"
+#~ msgstr "alemán"
+
+#~ msgid "el"
+#~ msgstr "Griego"
+
+#~ msgid "eo"
+#~ msgstr "esperanto"
+
+#~ msgid "es"
+#~ msgstr "español"
+
+#~ msgid "eu"
+#~ msgstr "euskera"
+
+#~ msgid "fr"
+#~ msgstr "francés"
+
+#~ msgid "hr"
+#~ msgstr "croata"
+
+#~ msgid "it"
+#~ msgstr "italiano"
+
+#~ msgid "nb"
+#~ msgstr "noruego (2)"
+
+#~ msgid "nl"
+#~ msgstr "holandés"
+
+#~ msgid "no"
+#~ msgstr "noruego (of)"
+
+#~ msgid "pl"
+#~ msgstr "polaco"
+
+#~ msgid "pt"
+#~ msgstr "portugués"
+
+#~ msgid "pt_BR"
+#~ msgstr "portugués (Br)"
+
+#~ msgid "ru"
+#~ msgstr "ruso"
+
+#~ msgid "sk"
+#~ msgstr "eslovaco"
+
+#~ msgid "sv"
+#~ msgstr "sueco"
+
+#~ msgid "zh_CN"
+#~ msgstr "chino (China)"
+
+#~ msgid "New Room"
+#~ msgstr "Nuevo salón"
+
+#, fuzzy
+#~ msgid "Jabber ID"
+#~ msgstr "ID de Jabber:"
+
+#, fuzzy
+#~ msgid "User ID"
+#~ msgstr "Identificador:"
+
+#, fuzzy
+#~ msgid "Invalid room or server name"
+#~ msgstr "Nombre de usuario no válido"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Versión de D-Bus desconocida: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "vCard publicada con éxito"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Tu información personal ha sido publicada con éxito"
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Entrar en un nuevo salón"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Oculta este menú"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d mensaje sin leer"
+#~ msgstr[1] "Gajim - %d mensajes sin leer"
+
+#, fuzzy
+#~ msgid "Since %s"
+#~ msgstr "Tamaño: %s"
+
 #~ msgid "_Subscribe"
 #~ msgstr "_Añadir"
 
@@ -5906,10 +6540,6 @@ msgstr ""
 #~ msgid "Send"
 #~ msgstr "Enviar"
 
-#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-#~ msgstr ""
-#~ "%(nickname)s en el salón %(room_name)s te ha enviado un nuevo mensaje"
-
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s te ha enviado un nuevo mensaje"
 
@@ -6059,9 +6689,6 @@ msgstr ""
 #~ msgid "Session bus is not available."
 #~ msgstr "El bus de la sesión no está disponible."
 
-#~ msgid "with account %s"
-#~ msgstr "para la cuenta %s"
-
 #~ msgid "with account "
 #~ msgstr "cuenta: "
 
@@ -6194,9 +6821,6 @@ msgstr ""
 #~ msgid "Click to get contact's extended information"
 #~ msgstr "Click para información extendida sobre el contacto"
 
-#~ msgid "Enter your message:"
-#~ msgstr "Introduce tu mensaje:"
-
 #~ msgid "_Compact View"
 #~ msgstr "Vista _compacta"
 
@@ -6248,9 +6872,6 @@ msgstr ""
 #~ msgid "Show roster window on Gajim startup"
 #~ msgstr "Mostrar la lista de contactos al inicio de Gajim"
 
-#~ msgid "_Join Group Chat"
-#~ msgstr "_Entrar a un grupo de charla"
-
 #~ msgid "_Service Discovery"
 #~ msgstr "Gestión de _servicios"
 
diff --git a/po/eu.po b/po/eu.po
index 25b7e5d96..fa5432840 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the gajim package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2005.
 #
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-13 12:52+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-07-19 22:02+0100\n"
 "Last-Translator: Urtzi Alfaro <urtzi@altza.net>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -17,15 +18,15 @@ msgstr ""
 "X-Rosetta-Version: 0.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber bezeroa"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Gajim Behealako Mezularitza"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "IM Jabber Bezeroa"
 
@@ -42,16 +43,23 @@ msgid "_Discover Services..."
 msgstr "_Zerbitzuak Aurkitu..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "Txat _Taldea"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Kontua E_ditatu"
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Ireki E-posta Konposatzailea"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Egoera"
 
@@ -75,7 +83,8 @@ msgstr "<b>Mesedez bete zure kontu berrirako informazioa</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Sakatu Jabber zerbitzariaren zenbait aukera(Msn ,ICQ, transport) ikusteko"
+msgstr ""
+"Sakatu Jabber zerbitzariaren zenbait aukera(Msn ,ICQ, transport) ikusteko"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "Connect when I press Finish"
@@ -104,7 +113,7 @@ msgid "Pass_word:"
 msgstr "Pasa_hitza:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Gorde pasa_hitza"
 
@@ -129,7 +138,7 @@ msgid "Your JID:"
 msgstr "Zure JID-a:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "A_urreratua"
 
@@ -143,7 +152,7 @@ msgid "_Host:"
 msgstr "_Host-a"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
@@ -175,10 +184,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Denetatik</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informazio Pertsonala</b>"
 
@@ -195,6 +206,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Konektatu berriro konexioa galtzean"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "K_onektatu Gajim irikitzean"
 
@@ -203,10 +215,19 @@ msgid "Chan_ge Password"
 msgstr "Al_datu Pasahitza"
 
 #: ../data/glade/account_modification_window.glade.h:9
-msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
-msgstr "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Aukeratu _Kodea...."
 
@@ -223,20 +244,16 @@ msgid "Edit Personal Information..."
 msgstr "Informazio Pertsonala Editatu..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/notify.py:308
-#: ../src/notify.py:330
-#: ../src/notify.py:342
-#: ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290
-#: ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Orokorra"
 
@@ -245,24 +262,49 @@ msgid "Hostname: "
 msgstr "Hostname: "
 
 #: ../data/glade/account_modification_window.glade.h:17
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
 
 #: ../data/glade/account_modification_window.glade.h:19
-msgid "If checked, Gajim will send keep-alive packets so it prevents connection timeout which results in disconnection"
-msgstr "Hautatua badago, Gajim-ek keep-alive paketeak bidaliko ditu deskonexioa gerta ez dadin"
+msgid ""
+"If checked, Gajim will send keep-alive packets so it prevents connection "
+"timeout which results in disconnection"
+msgstr ""
+"Hautatua badago, Gajim-ek keep-alive paketeak bidaliko ditu deskonexioa "
+"gerta ez dadin"
 
 #: ../data/glade/account_modification_window.glade.h:20
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Hautatua badago, Gajim-ek pasahitzak  ~/.gajim/config gordeko ditu irakurtzeko baimena zuk bakarrik izanik"
+#: ../data/glade/zeroconf_properties_window.glade.h:8
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Hautatua badago, Gajim-ek pasahitzak  ~/.gajim/config gordeko ditu "
+"irakurtzeko baimena zuk bakarrik izanik"
 
 #: ../data/glade/account_modification_window.glade.h:21
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Hautatua badago, abiaraztean, automatikoki jabber-era konektatuko da kontu hau erabiliz"
+#: ../data/glade/zeroconf_properties_window.glade.h:9
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Hautatua badago, abiaraztean, automatikoki jabber-era konektatuko da kontu "
+"hau erabiliz"
 
 #: ../data/glade/account_modification_window.glade.h:22
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
+#: ../data/glade/zeroconf_properties_window.glade.h:10
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
 
 #: ../data/glade/account_modification_window.glade.h:23
 msgid "Information about you, as stored in the server"
@@ -273,22 +315,22 @@ msgid "Manage..."
 msgstr "Moldatu..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../src/config.py:1448
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Ez da koderik aukeratu"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../src/config.py:1053
-#: ../src/config.py:1058
-#: ../src/config.py:1230
-#: ../src/config.py:1505
-#: ../src/config.py:1578
-#: ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Ezer ez"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informazio Pertsonala "
 
@@ -301,55 +343,81 @@ msgid "Priori_ty:"
 msgstr "Lehentas_una:"
 
 #: ../data/glade/account_modification_window.glade.h:31
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
-msgstr "Jabber-en lehentasuna, bi bezero edo gehiago konektatuta daudenean kontu berdinarekin, zeinek jaso behar duen informazioa determinatzen du; Lehentasun handiena duen bezeroak jasotzen ditu mezuak"
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Jabber-en lehentasuna, bi bezero edo gehiago konektatuta daudenean kontu "
+"berdinarekin, zeinek jaso behar duen informazioa determinatzen du; "
+"Lehentasun handiena duen bezeroak jasotzen ditu mezuak"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Baliabid_ea: "
 
-#: ../data/glade/account_modification_window.glade.h:34
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Baliabidea Jabber-eko zerbitzarira bidaltzen da JID berdineko eta zerbitzari berdinera konektatutako kontua bi zati desberdinetan edo gehiagotan banatzeko asmoarekin. Hau horrela dabil: kontu bat  `Lana` baliabidearekin jarrita eta kontu berdera `etxea` baliabidearekin jarria baduzu, mezua lehentasun handiena duenera bidaliko da. (Behean ikusi) "
-
 #: ../data/glade/account_modification_window.glade.h:35
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Baliabidea Jabber-eko zerbitzarira bidaltzen da JID berdineko eta zerbitzari "
+"berdinera konektatutako kontua bi zati desberdinetan edo gehiagotan "
+"banatzeko asmoarekin. Hau horrela dabil: kontu bat  `Lana` baliabidearekin "
+"jarrita eta kontu berdera `etxea` baliabidearekin jarria baduzu, mezua "
+"lehentasun handiena duenera bidaliko da. (Behean ikusi) "
+
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Gorde _pasa-esaldia(ez trinkoa)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "_Gorde kontu guztien elkarrizketak"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Bidali keep-alive paketeak"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Egoera globalarekin kontaktuen egoera sinkro_nizatu "
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Erabili _SSL(Legacy)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Erabili bezeroaren hostname/portua"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Erabili proxy fitxero transferentzia"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Izena "
 
@@ -358,55 +426,89 @@ msgid "Accounts"
 msgstr "Kontuak"
 
 #: ../data/glade/accounts_window.glade.h:2
-msgid "If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account"
-msgstr "Bi kontu edo gehiago badituzu eta aukera hau hautatua badago, Gajim-ek kontaktu guztiak kontu bat izango bazenu bezala jarriko lituzke zerrendan"
+msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
+"If you have 2 or more accounts and it is checked, Gajim will list all "
+"contacts as if you had one account"
+msgstr ""
+"Bi kontu edo gehiago badituzu eta aukera hau hautatua badago, Gajim-ek "
+"kontaktu guztiak kontu bat izango bazenu bezala jarriko lituzke zerrendan"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Batu kontuak"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Eraldatu"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Ezabatu"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
+#, fuzzy
+msgid "A_ccount:"
+msgstr "Kontu_a:"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
 msgid "A_llow this contact to view my status"
 msgstr "Baimendu kontaktu honi nire egoera ikustea"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Kontaktu Berri bat Sartu"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-msgid "_Account:"
-msgstr "Kontu_a:"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 msgid "_Group:"
 msgstr "Ta_ldea:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 msgid "_Nickname:"
 msgstr "_Izengoitia:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 msgid "_Protocol:"
 msgstr "_Protokoloa:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Harpidetu"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Erre_gistratu"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 msgid "_User ID:"
 msgstr "E_rabiltzailearen ID:"
 
@@ -416,7 +518,9 @@ msgstr "<b>Deskribapena</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
-msgstr "<b>OHARRA:</b> Gajim berriro abiarazi beharko duzu aldagai batzuek efektua sor dezaten"
+msgstr ""
+"<b>OHARRA:</b> Gajim berriro abiarazi beharko duzu aldagai batzuek efektua "
+"sor dezaten"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -436,7 +540,8 @@ msgstr "Eguneko Mezuak Ezabatu"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
 msgid "Sends a message to currently connected users to this server"
-msgstr "Bidali mezu bat zerbitzari honetara orain konektatuta dauden kontaktuei"
+msgstr ""
+"Bidali mezu bat zerbitzari honetara orain konektatuta dauden kontaktuei"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
 msgid "Set MOTD"
@@ -492,71 +597,57 @@ msgid "<b>Sounds</b>"
 msgstr "<b>Soinuak</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
-msgid "Add"
-msgstr "Gehitu"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
 msgid "Advanced Actions"
 msgstr "Ekintza Aurreratuak"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 msgid "Advanced Notifications Control"
 msgstr "Notifikazio Aurreratuaren Kontrola"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 msgid "All Status "
 msgstr "Egoera Guztiak"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr "eta nik"
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Kanpoan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 msgid "Busy "
 msgstr "Lanpetuta"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr "Ez daukadanean"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-msgid "Down"
-msgstr "Bera"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr "daukadanean"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Ikusezin"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 msgid "Launch a command"
 msgstr "Abiarazi agindua"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-msgid "List of special notifications settings"
-msgstr "Notifikazio berezien aldaketen zerrenda"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Ez Erabilgarri"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 msgid "Online / Free For Chat"
 msgstr "Libre / Libre Hitz Egiteko"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 msgid "Play a sound"
 msgstr "Soinua ezarri"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -578,59 +669,60 @@ msgstr ""
 "Fitxero Transferentzia Hastean\n"
 "Fitxero Transferentzia Bukatzean"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr "Egorera berezi bat(zuk)..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr "Gora"
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr "Denean"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable auto opening chat window"
 msgstr "_Ezindu automatikoki elkarrizketa leihoa irikitzea"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr "_Kendu esistitzen den popup leihoa "
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr "_Ezindu esistitzen den soinua gertaera hontarako "
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr "_Ezindu gertaeran zerrendan ikustea"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr "_Ezindu gertaerak systray-en ikustea"
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr "_Jakinarazi popup leiho batekin"
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Open chat window with user"
 msgstr "_Ireki elkarrizketa leihoa erabiltzailearekin"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in roster"
 msgstr "_Ikusarazi gertaera zerrendan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "_Show event in systray"
 msgstr "Iku_si gertaerak systray-ean"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+#, fuzzy
+msgid "and I "
+msgstr "eta nik"
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
@@ -640,11 +732,11 @@ msgstr ""
 "taldea(k)\n"
 "denak"
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "for "
 msgstr "norentzat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr "Nagoenean"
 
@@ -679,7 +771,7 @@ msgstr "Txat Taldean _Sartu"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Zerrendara Sartu"
 
@@ -700,7 +792,8 @@ msgid "_Open Link in Browser"
 msgstr "Web-ean _Ireki Lotura"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "Elkarrizketa  _Hasi"
@@ -710,7 +803,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Sakatu kontaktu honen elkarrizketa zaharrak ikusteko"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Bidali _Fitxeroa"
 
@@ -726,7 +820,8 @@ msgstr "_Bista trikoa        Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historiala"
 
@@ -752,7 +847,9 @@ msgstr "Kantzelatu aukeratutako fitxategi transferentzia"
 
 #: ../data/glade/filetransfers.glade.h:4
 msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Kantzelatu aukeratutako fitxategi transferentzia eta ezabatu bukatu gabeko fitxeroa "
+msgstr ""
+"Kantzelatu aukeratutako fitxategi transferentzia eta ezabatu bukatu gabeko "
+"fitxeroa "
 
 #: ../data/glade/filetransfers.glade.h:5
 msgid "Clean _up"
@@ -772,22 +869,27 @@ msgstr "Listatik fitxero tranferentzia ezabatu."
 
 #: ../data/glade/filetransfers.glade.h:9
 msgid "Removes completed, canceled and failed file transfers from the list"
-msgstr "Ezabatu  kantzelatuak, osorik eta huts egin dutenak  fitxero transferentzia zerrendatik"
+msgstr ""
+"Ezabatu  kantzelatuak, osorik eta huts egin dutenak  fitxero transferentzia "
+"zerrendatik"
 
 #: ../data/glade/filetransfers.glade.h:10
 msgid "Shows a list of file transfers between you and other"
 msgstr "Erakutsi zu eta beste baten arteko fitxero transferentzia"
 
 #: ../data/glade/filetransfers.glade.h:11
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "Aukera honek fitxero transferentzia bakar bat kantzelatzen du. Transferentzia martxan badago, lehenik gelditu egingo da eta ondoren ezabatu."
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Aukera honek fitxero transferentzia bakar bat kantzelatzen du. "
+"Transferentzia martxan badago, lehenik gelditu egingo da eta ondoren ezabatu."
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Fitxero transferentzia bukatzean erakutsi popup jakinarazte bat"
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Jarraitu"
 
@@ -795,8 +897,7 @@ msgstr "_Jarraitu"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Jakinarazi  fitxeroa transferitu denean"
 
-#: ../data/glade/filetransfers.glade.h:15
-#: ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190
 msgid "_Open Containing Folder"
 msgstr "_Ireki Fitxeroaren Edukia"
 
@@ -825,40 +926,34 @@ msgstr ""
 "Banner"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4
-#: ../src/config.py:326
-msgid "Active"
-msgstr "Aktibatuta"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Sortzen"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Iturburuaren estiloa:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Gajim-en Gaien Kustomizatazailea"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Joanda"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Inaktiboa"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Etzana"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -866,7 +961,7 @@ msgstr ""
 "MUC\n"
 "Mezuak"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -874,20 +969,19 @@ msgstr ""
 "MUC Zuzendua\n"
 "Mezuak"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
-#: ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Etena"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "Testuaren _kolorea:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "Testu _mota:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "A_tzealdeko kolorea:"
 
@@ -954,14 +1048,16 @@ msgid ""
 "You can select logs from the left and/or search database from below.\n"
 "\n"
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<big><b>Ongi Etorri Gajim Log Historial Administratzailera</b></big>\n"
 "\n"
 "Eskubian log-ak hautatu ditzakezu edo/eta behean datu basean bilatu.\n"
 "\n"
 "<b>OHARRA:</b>\n"
-"Ezabatze handia egin behar baduzu, Gajim abiarazita ez dagoela begira ezazu. Normalean hitz egiten ari zaren kontaktuaen ezabaketak arbuilatzen ditu."
+"Ezabatze handia egin behar baduzu, Gajim abiarazita ez dagoela begira ezazu. "
+"Normalean hitz egiten ari zaren kontaktuaen ezabaketak arbuilatzen ditu."
 
 #: ../data/glade/history_manager.glade.h:7
 msgid "Delete"
@@ -1004,7 +1100,7 @@ msgid "Accept"
 msgstr "Onartu"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Ukatu"
 
@@ -1012,14 +1108,14 @@ msgstr "Ukatu"
 msgid "Invitation Received"
 msgstr "Gonbidapena Jasoa"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Txat Taldean Sartu"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Izengoitia:"
 
@@ -1037,14 +1133,8 @@ msgstr "Berriki:"
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Zerbitzaria:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7
-#: ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Sartu"
 
@@ -1068,6 +1158,10 @@ msgstr "Talde Agenda Moldatu"
 msgid "Print status:"
 msgstr "Inprimatu egoera:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Zerbitzaria:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Izenburua:"
@@ -1089,7 +1183,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Proxy Profila Moldatu"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Izena:"
 
@@ -1105,21 +1200,21 @@ msgstr "Erabili autentifikazioa"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2
-#: ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "Ireki OpenPGP Enkriptazioa"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Aukerak"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Bidali"
 
@@ -1184,25 +1279,34 @@ msgstr "Baimena _OS informazioa bidaltzeko"
 
 #: ../data/glade/preferences_window.glade.h:18
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Baimendu Popup/Jakinarazteak nagoenean:  Kanpoan/Ez Erabilgarri/Lanpetuta/Ikusezin"
+msgstr ""
+"Baimendu Popup/Jakinarazteak nagoenean:  Kanpoan/Ez Erabilgarri/Lanpetuta/"
+"Ikusezin"
 
 #: ../data/glade/preferences_window.glade.h:19
 msgid "Also known as iChat style"
 msgstr "iChat estiloa bezala ere ezagutua"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Eskatu egoera mezua, nagoenean:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Automatikoki _Kanpoan ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Automatikoki _Ez Erabilgarri ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1214,100 +1318,157 @@ msgstr ""
 "Beti KDE-ren berezko aplikazioak erabili\n"
 "Bezeroa"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "Izengoitia baino l_ehen:"
 
-#: ../data/glade/preferences_window.glade.h:28
-#: ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Txat"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Txateko egoeraren ja_kinaraztea:"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, cause it blocks all messages from any contact that is not in the roster"
-msgstr "Bakarrik hautatu aukera hau zerrendan ez duzun norbaitek zirikatzen bazaitu. Kontu handiz erabili, zerrendan ez dagoen edonoren mezuak blokeatzen ditu"
-
 #: ../data/glade/preferences_window.glade.h:31
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, cause it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Bakarrik hautatu aukera hau zerrendan ez duzun norbaitek zirikatzen bazaitu. "
+"Kontu handiz erabili, zerrendan ez dagoen edonoren mezuak blokeatzen ditu"
+
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Egoera Mezua"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "Berezko egoera _ikurra:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr "Erakutsarazi epostaren g_ehigarrizko xehetasunak"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "5 _minuturo"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Emoticonoak:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Gertaerak"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party."
-msgstr "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party."
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Gajim will automatically show new events by poping up the relative window"
-msgstr "Gajim-ek automatikoki gertaera berriak agertaraziko ditu hautatutako leihoan "
-
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Gajim will notify you for new events via a popup in the bottom right of the screen"
-msgstr "Gajim-ek gertaera berriez jakinaraziko dizu popup bidez pantailaren beheko eskubiko aldean"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
-msgstr "Sartu berri diren kontaktuez jakinaraziko dizu Gajim-ek popup bidez"
+msgid ""
+"Gajim will automatically show new events by poping up the relative window"
+msgstr ""
+"Gajim-ek automatikoki gertaera berriak agertaraziko ditu hautatutako leihoan "
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Deskonektatu diren kontaktuez Gajim-ek jakinaraziko dizu popup bidez pantailako beheko eskubiko aldean"
+msgid ""
+"Gajim will notify you for new events via a popup in the bottom right of the "
+"screen"
+msgstr ""
+"Gajim-ek gertaera berriez jakinaraziko dizu popup bidez pantailaren beheko "
+"eskubiko aldean"
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim-ek bakarrik kontaktuaren ikonoa aldatuko du gertaera berri bat duenean"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed in"
+msgstr "Sartu berri diren kontaktuez jakinaraziko dizu Gajim-ek popup bidez"
 
-#: ../data/glade/preferences_window.glade.h:45
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak azalaraziko ditu"
+#: ../data/glade/preferences_window.glade.h:44
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Deskonektatu diren kontaktuez Gajim-ek jakinaraziko dizu popup bidez "
+"pantailako beheko eskubiko aldean"
 
-#: ../data/glade/preferences_window.glade.h:46
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen azpian eta txat taldeetan"
+#: ../data/glade/preferences_window.glade.h:45
+msgid ""
+"Gajim will only change the icon of the contact that triggered the new event"
+msgstr ""
+"Gajim-ek bakarrik kontaktuaren ikonoa aldatuko du gertaera berri bat duenean"
 
 #: ../data/glade/preferences_window.glade.h:47
-msgid "If checked, Gajim will remember the roster and chat window positions in the screen and the sizes of them next time you run it"
-msgstr "Hautatua badago, Gajim-ek berriz abiarazten duzunean zerrendako eta baita txat leihoaren pantailako lekua eta tamaina gogoraraziko dizu"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:48
-msgid "If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)"
-msgstr "Hautatua badago, Gajim-ek protokolo bakoitzaren egoera ikurrak irabiliko ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak jarriko dira)"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
+"azalaraziko ditu"
 
 #: ../data/glade/preferences_window.glade.h:49
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Ez badago ezeztatuta, Gajim-ek  ´:)´ ascii hauek bere irudi grafiko estatiko edo animatura eraldatuko ditu"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
+"azpian eta txat taldeetan"
 
 #: ../data/glade/preferences_window.glade.h:50
+msgid ""
+"If checked, Gajim will remember the roster and chat window positions in the "
+"screen and the sizes of them next time you run it"
+msgstr ""
+"Hautatua badago, Gajim-ek berriz abiarazten duzunean zerrendako eta baita "
+"txat leihoaren pantailako lekua eta tamaina gogoraraziko dizu"
+
+#: ../data/glade/preferences_window.glade.h:51
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Hautatua badago, Gajim-ek protokolo bakoitzaren egoera ikurrak irabiliko "
+"ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
+"jarriko dira)"
+
+#: ../data/glade/preferences_window.glade.h:52
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Ez badago ezeztatuta, Gajim-ek  ´:)´ ascii hauek bere irudi grafiko estatiko "
+"edo animatura eraldatuko ditu"
+
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "Mo_ldatu..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1319,221 +1480,241 @@ msgstr ""
 "Kontuko\n"
 "Gaiaz"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 msgid "Notify on new _GMail email"
 msgstr "_Gmail-eko E-posta berri batez jakinarazi"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "Mezu _guztietan"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "M_ezu leiho bat"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Soinuak _entzun"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Imprimatu ordua:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "Gorde zerrendaren eta txat leihoaren _lekua eta tamaina"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Ikusi _zerrendan bakarrik"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_Konektatuta"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_Deskonektatuta"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Egoera"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "G_aia:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Automatikoki kanpoko egoera mezua"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Automatikoki ez erabilgarriko egoera mezua"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Erabili _transporteen ikurrak"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr "_Sistemaren berezkoa erabili"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "E_rabili ikonifikazioa (aka. notification area)"
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid "When a new event (message, file transfer request etc..) is received, the following methods may be used to inform you about it. Please note that events about new messages only occur if it is a new message from a contact you are not already chatting with"
-msgstr "Metodo honekin, gertaera berri bat (mezu bat, fitxero trasferentzia eskaera...) jasotzean, horiei buruz jakinaraziko zaizu. Mezu berri baten jakinaraztea, bakarrik, dagoeneko hitz egiten ari zaren pertsona batekin izan ezik izango da"
+#: ../data/glade/preferences_window.glade.h:77
+msgid ""
+"When a new event (message, file transfer request etc..) is received, the "
+"following methods may be used to inform you about it. Please note that "
+"events about new messages only occur if it is a new message from a contact "
+"you are not already chatting with"
+msgstr ""
+"Metodo honekin, gertaera berri bat (mezu bat, fitxero trasferentzia "
+"eskaera...) jasotzean, horiei buruz jakinaraziko zaizu. Mezu berri baten "
+"jakinaraztea, bakarrik, dagoeneko hitz egiten ari zaren pertsona batekin "
+"izan ezik izango da"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Ekintza berri bat jasotzean."
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "_Advanced Notifications Control..."
 msgstr "Notifikazio _Aurreratuaren Kontrola..."
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "Ordu_aren ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "Ordua _baino lehen:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Bilatu:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "_Fitxero administratzaile:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Mota:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "_Sarrerako mezua:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Email bezeroa"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Inoiz"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Jakinarazi horri buruz"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Ireki..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "Kanp_oan nagoeneko mezua:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Entzun"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Agertarazi"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "Be_rezko Koloreak Ezarri"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "_Sailkatu kontaktuak egoeraren bidez"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "Egoera mezua:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minutu"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Debekatze Zerrenda"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Ezarri / Editatu arau bat</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Arauen zerrenda</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Debekatze Zerrenda</i>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5
-#: ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "K_onektatu Gajim irikitzean"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr "Dena"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr "Baimendu"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-msgid "Default"
-msgstr "Berezkoa"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "Order:"
 msgstr "Ordena:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11
-#: ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 msgid "Privacy List"
 msgstr "Debekatze Zerrenda"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 msgid "all by subscription"
 msgstr "harpidetza honekin"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all in the group"
 msgstr "talde hontakoak"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1545,29 +1726,169 @@ msgstr ""
 "nondik\n"
 "norentzat"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 msgid "to send me messages"
 msgstr "niri mezuak bidaltzea"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr "niri galderak bidaltzeko"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me status"
 msgstr "niri egoera bidaltzeko"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to view my status"
 msgstr "nire egoera ikustea"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr "Sortu zure debekatze zerrenda"
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "About"
+
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Helbidea"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Ezarri _Abatereak"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Urtebetetzea:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Hiria:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Konpainia:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Estatua:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Departamentua:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Posta:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Helbide Gehigarria:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Familia:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Formatua: YYYY-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Emandako izena:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Web Pertsonala:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Erdi izena:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Gehiago"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Informazio Pertsonala "
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefono Zenbakia:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Tokia:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Posta Kodea:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Aurreizkia izenean:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Eginkizuna:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Egoera:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Kalea:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Atzizkia izenean:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Lana"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Argitaratu"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr "Zerbitzarian oinarritutako Debekatze Zerrenda"
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Berridatzi"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1586,45 +1907,56 @@ msgid "A_sk to see his/her status"
 msgstr "Bere egoera ikusteko esan"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Gehitu _Noifikazio Berezia"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Open_PGP kodea zehaztu"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Editatu _Taldeak"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Bidali Mezu _Bakarra"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Elkarrizketa _Hasi"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Allow him/her to see my status"
 msgstr "Baimendu nire egoera ikustea"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "_Forbid him/her to see my status"
 msgstr "Debekatu nire egoera ikustea"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Zerrendatik Ezabatua"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Berrrizenpetu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Harpidetza"
 
@@ -1649,43 +1981,53 @@ msgid "Help online"
 msgstr "Online laguntza"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Profila, Abatareak"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transportea"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Edukiak"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Zerbitzuak Aurkitu"
 
-#: ../data/glade/roster_window.glade.h:13
-#: ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Hobespenak"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "At_era"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Ahotsa"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "J_oan"
@@ -1755,22 +2097,18 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Kontaktu autorizatua beraz, zure egoera ikus dezake"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "Kontaktuaren _ Informazioa"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "Autorizazioa ezeztatu, honela kontaktuak ezin du zure egoera ikusi"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Harpidetza Eskaria"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Autorizatu"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Ukatu"
 
@@ -1786,164 +2124,51 @@ msgstr "Ikusi _Zerrenda"
 msgid "Sta_tus"
 msgstr "E_goera"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "About"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Helbidea"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Eskatua:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Urtebetetzea:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Hiria:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Bezeroa:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Konpainia:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Kontaktuaren Informazioa"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Estatua:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Departamentua:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "E-Posta:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Helbide Gehigarria:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Familia:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Formatua: YYYY-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Emandako izena:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Web Pertsonala:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktua"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Kokapena"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Erdi izena:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Gehiago"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Telefono Zenbakia:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Tokia:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Posta Kodea:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Aurreizkia izenean:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Baliabidea:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Eginkizuna:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Ezarri _Abatereak"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Egoera:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Egoera:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Kalea:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Harpidetza:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Atzizkia izenean:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Lana"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "Elkarrizketaren _historiala"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Argitaratu"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Berridatzi"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafikoa</b>"
@@ -1975,328 +2200,511 @@ msgstr "_Mezua"
 msgid "_Presence"
 msgstr "_Egoera"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Izena:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Izena:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Informazio pertsonala"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "Kontua E_ditatu"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Erabili bezeroaren hostname/portua"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Izen Hautapena"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Balorea"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Mota"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Ezer ez)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Ikusezin"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163
-#: ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Orokorra"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "berdea"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Kokapena"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Etzana"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Argitaratu"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
-"If that is not your language for which you want to highlight misspelled words, then please set your $LANG as appropriate. Eg. for French do export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
+"If that is not your language for which you want to highlight misspelled "
+"words, then please set your $LANG as appropriate. Eg. for French do export "
+"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
+"global in /etc/profile.\n"
 "\n"
 "Highlighting misspelled words feature will not be used"
 msgstr ""
-"If that is not your language for which you want to highlight misspelled words, then please set your $LANG as appropriate. Eg. for French do export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
+"If that is not your language for which you want to highlight misspelled "
+"words, then please set your $LANG as appropriate. Eg. for French do export "
+"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
+"global in /etc/profile.\n"
 "\n"
 "Highlighting misspelled words feature will not be used"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186
-#: ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Konexioa ez dago erabilgarri"
 
-#: ../src/chat_control.py:187
-#: ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Txat-ak"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s: %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s-ak ez du trasmititu OpenPGP kode bat ez behintzat ezarritakorik"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239
-#: ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512
-#: ../src/gajim.py:635
-#: ../src/gajim.py:636
-#: ../src/gajim.py:955
-#: ../src/roster_window.py:276
-#: ../src/roster_window.py:1335
-#: ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806
-#: ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123
-#: ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977
-#: ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39
-#: ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "Ez dago zerrendan"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: ../src/chat_control.py:1384
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko duzu."
+#: ../src/chat_control.py:1527
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
+"duzu."
 
-#: ../src/config.py:120
-#: ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Ezindu"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "%s _minuturo"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Aktibatuta"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Konexioa ez dago erabilgarri"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Lehen Mezu Jasoa"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Kontaktua Konektatuta"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1158
-#: ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Irakurri gabeko gertaerak"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
-msgstr "Kontuko izena aldatzeko,  irakurri gabeko gertaera guztiak irakurri behar dituzu."
+msgstr ""
+"Kontuko izena aldatzeko,  irakurri gabeko gertaera guztiak irakurri behar "
+"dituzu."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Kontu Izena Jadanik Erabilia"
 
-#: ../src/config.py:1164
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu beste izen bat."
+#: ../src/config.py:1290
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
+"beste izen bat."
 
-#: ../src/config.py:1168
-#: ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:1181
-#: ../src/config.py:1187
-#: ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Birkargatu orain?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Momentuan aldaturiko aukerak ezarri nahi badituzu, birkargatu beharko duzu."
+msgstr ""
+"Momentuan aldaturiko aukerak ezarri nahi badituzu, birkargatu beharko duzu."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 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:1410
-#: ../src/dialogs.py:925
-#: ../src/dialogs.py:1099
-#: ../src/disco.py:410
-#: ../src/vcard.py:457
-#: ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "Kontu bat sortu behar duzu informazio petsonala editatu baino lehen."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Giltzaren Aukera"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
 #. Name column
-#: ../src/config.py:1667
-#: ../src/disco.py:727
-#: ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
-msgstr "Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
+msgstr ""
+"Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
+
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Ez duzu aktibatutako konturik"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
 
-#: ../src/config.py:1911
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Kontu Izena Jadanik Erabilia"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Partaide Zerrenda"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020
-#: ../src/disco.py:734
-#: ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Arrazoia"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Izengoitia"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Eginkizuna"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Debekatzen..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2304,11 +2712,11 @@ msgstr ""
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2316,11 +2724,11 @@ msgstr ""
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2328,11 +2736,11 @@ msgstr ""
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2340,7 +2748,7 @@ msgstr ""
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2356,647 +2764,674 @@ msgstr ""
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2183
-#: ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2184
-#: ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2185
-#: ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Gela Berria"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Txat Taldea"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:2384
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Mesedez ziurtatu ezazu zerbitzariaren eta gelaren informazioa betetzeaz edo talde agenda hau ezabatzeaz"
+#: ../src/config.py:2668
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Mesedez ziurtatu ezazu zerbitzariaren eta gelaren informazioa betetzeaz edo "
+"talde agenda hau ezabatzeaz"
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:2648
-#: ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Kontu berrirako pasahitz bat sartu behar duzu."
 
-#: ../src/config.py:2653
-#: ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/config.py:2654
-#: ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Bikoiztutako Jabber ID "
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Kontaktu hau dagoeneko Gajim-en konfiguratua dago."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:2692
-#: ../src/config.py:2725
-msgid "You can set advanced account options by pressing Advanced button, or later by clicking in Accounts menuitem under Edit menu from the main window."
+#: ../src/config.py:2982 ../src/config.py:3015
+msgid ""
+"You can set advanced account options by pressing Advanced button, or later "
+"by clicking in Accounts menuitem under Edit menu from the main window."
 msgstr "Kontuko aukera aurreratuak ezarri ditzakezu Aurreratu botoila sakatuz."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
-#: ../src/conversation_textview.py:205
-msgid "Text below this line is what has been said since the last time you paid attention to this group chat"
+#: ../src/conversation_textview.py:273
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
 msgstr "Beheko testua adi zeuden azken uneko txat taldeko mezuak dira"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "\"%s\" -rako aukerak"
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL hiztegia galdu egin da \"%s\" -an eta ez dago WIKTIONARY-an"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Atzo"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "%i egun lehenago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python bindings are missing in this computer"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Gajim-en D-Bus gaitasun funtzioa ezin da erabili"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktuaren izena: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Taldea"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "Taldean"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "ID kodea"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Kontaturen izena"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Egoera Mezua"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Aurrez Ezarritako Mezua Jarri"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Mesedez ezarri izen bat egoera mezu honetarako"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Helbidea:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Helbidea:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Helbide Gehigarria:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Mesedez ezarri sartu nahi duzun kontaktuaren informazioa %s kontuarako"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../src/dialogs.py:403
-#: ../src/disco.py:109
-#: ../src/disco.py:110
-#: ../src/disco.py:1249
-#: ../src/roster_window.py:207
-#: ../src/roster_window.py:273
-#: ../src/roster_window.py:309
-#: ../src/roster_window.py:329
-#: ../src/roster_window.py:353
-#: ../src/roster_window.py:2973
-#: ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportea"
 
-#: ../src/dialogs.py:493
-#: ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Bezero ID Baliogabea"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "ID erabiltzaileak ez du baliabiderik eraman behar."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "E_rabiltzailearen ID:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber bezeroa"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr "GTK+ Bertsioa:"
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr "PyGTK Bertsioa:"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 msgid "Current Developers:"
 msgstr "Egungo diseinatzaileak: "
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Aurre diseinatzaileak: "
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "ESKERRAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Azkenak baina ez gutxien merezitakoak,\n"
 "eskerrak eman nahi dzkiegu paketeak mantentzen dituztenei."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Unable to bind to port %s."
 
-#: ../src/dialogs.py:739
-msgid "Maybe you have another running instance of Gajim. File Transfer will be canceled."
-msgstr "Beharbada beste Gajim prozesu bat abiarazita duzu. Fitxero transferentzia bertan behera utziko da."
+#: ../src/dialogs.py:887
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"canceled."
+msgstr ""
+"Beharbada beste Gajim prozesu bat abiarazita duzu. Fitxero transferentzia "
+"bertan behera utziko da."
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "%s gelan zaude dagoeneko"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Txat Taldera Sartu %s kontuarekin"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Baliogabeko gela edo zerbitzari izena"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Jabber ID baliogabea"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Gela izenak edo zerbitzariak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Elkarrizketa Hasi %s kontuarekin"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
+#, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Idatzi mezua bidali nahi diozun\n"
 "kontaktuaren jid-a edota izengoitia:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078
-#: ../src/dialogs.py:1427
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:1079
-#: ../src/dialogs.py:1428
-#: ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: ../src/dialogs.py:1088
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 msgid "Invalid JID"
 msgstr "JID Baliogabea"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165
-#: ../src/notify.py:126
-#: ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: ../src/dialogs.py:1167
-#: ../src/notify.py:134
-#: ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
 #. chat message
-#: ../src/dialogs.py:1169
-#: ../src/notify.py:154
-#: ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Mezu Berria Bat"
 
 #. single message
-#: ../src/dialogs.py:1169
-#: ../src/notify.py:138
-#: ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Mezu Berri Bat"
 
 #. private message
-#: ../src/dialogs.py:1170
-#: ../src/notify.py:145
-#: ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: ../src/dialogs.py:1170
-#: ../src/gajim.py:1044
-#: ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: ../src/dialogs.py:1172
-#: ../src/gajim.py:1187
-#: ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/dialogs.py:1174
-#: ../src/gajim.py:1022
-#: ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: ../src/dialogs.py:1176
-#: ../src/gajim.py:1222
-#: ../src/gajim.py:1244
-#: ../src/gajim.py:1261
-#: ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: ../src/dialogs.py:1177
-#: ../src/gajim.py:1225
-#: ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/dialogs.py:1179
-#: ../src/gajim.py:920
-#: ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: ../src/dialogs.py:1181
-#: ../src/notify.py:118
-#: ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 msgid "Contact Changed Status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
 msgstr "Mezu Bakarra %s Kontuarekin"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
+msgstr "Mezu Bakarra %s Kontuarekin"
+
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Jasoa %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsola %s-rena"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr " XML Konsola"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Debekatze Zerrenda <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Deskribapena: %s"
+
+#: ../src/dialogs.py:1878
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Arau bat editatu</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ezarri Araua</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: ../src/dialogs.py:2064
-#: ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Aukeratu Irudia"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s bihurtzen denean:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+#, fuzzy
+msgid "when I am "
+msgstr "Nagoenean"
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Besteak"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Solasaldiak"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Konektatu gabe ezin duzu zerbitzari erabilgarriak bilatu"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Zerbitzua Aurkitua"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: ../src/disco.py:629
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu helbidea eta saiatu berriro."
+#: ../src/disco.py:638
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
+"helbidea eta saiatu berriro."
 
-#: ../src/disco.py:633
-#: ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du menurik begiratzeko."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Begiratzen %s  %s kontua erabiliz"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Bilatu"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: ../src/disco.py:1137
-#: ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Eskaneatzen  %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Erabiltzaileak"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Deskribapena"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Fitxeroa"
@@ -3009,35 +3444,30 @@ msgstr "Denbora"
 msgid "Progress"
 msgstr "Prozesua"
 
-#: ../src/filetransfers_window.py:163
-#: ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
 #, python-format
 msgid "Filename: %s"
 msgstr "Fitxeroaren izena: %s"
 
-#: ../src/filetransfers_window.py:164
-#: ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaina: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:173
-#: ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Zu"
 
 #: ../src/filetransfers_window.py:174
-#: ../src/filetransfers_window.py:224
 #, python-format
 msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
-#: ../src/filetransfers_window.py:175
-#: ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
@@ -3050,88 +3480,97 @@ msgstr "%s gordea"
 msgid "File transfer completed"
 msgstr "Fitxero transferentzia osatua"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
 msgid "File transfer canceled"
 msgstr "Fitxero transferentzia ezeztatua"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Hartzailea: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Errorea fitxeroa irakurtzean:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Fitxero transferentzia gelditua beste kontaktuarengatik"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim-ek ezin du fitxero honetan sartu."
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Beste prozesu batek erabiltzen du orain fitxero hau."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Fitxeroa: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s fitxero bat bidali nahi dizu:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ezin izan da gainarazi \"%s\" fitxeroa"
 
-#: ../src/filetransfers_window.py:312
-msgid "A file with this name already exists and you do not have permission to overwrite it."
-msgstr "Izen honekin dagoeneko badago fitxerorik eta ez duzu baimenik gainarazteko."
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"Izen honekin dagoeneko badago fitxerorik eta ez duzu baimenik gainarazteko."
 
-#: ../src/filetransfers_window.py:319
-#: ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: ../src/filetransfers_window.py:319
-#: ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" kokapena ez da idazgarria"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr "Ez duzu baimenik kokapen honetan fitxerorik sortzeko."
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Gorde Bezala..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3139,275 +3578,499 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528
-#: ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Fitxero Baliogabea"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Fitxeroa:"
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: ../src/filetransfers_window.py:552
-#: ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../src/filetransfers_window.py:554
-#: ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Etena"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim-ek Xserver behar du abiarazteko. Uzten..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du "
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du "
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ rutinak ez du libglade sostengatzen"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"GTK+ rutina ezabatu eta instalatu ezazu azken bertsio establea %s hemendik"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr "Konproba ezazu GTK+ eta  PyGTK  libglade onartzen dutea zure sistemak."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim-ek PySQLite2 behar du abiarazteko"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim-ek PySQLite2 behar du abiarazteko"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr "Gajim dagoeneko abiarazi da"
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"Beste Gajim prozesu bat abiarazita dagoela dirudi\n"
+"Abiarazi dena den?"
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Baimen hau onartzen al duzu?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Konektatu"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Gaia: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "errorea bidaltzen zen bitartean %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Autorizazioa baimendua"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "\"%s\" kontaktuak baimendu dizu bere egoera ikusteko."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Beti deskonektatuta ikusiko duzu."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "\"%s\" ezin izan da kontaktuan jarri"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s orain %s dago: (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Zure pasa-esaldia ez da egokia"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Zure OpenPGP koderik gabe konektatu zara."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "E-posta Berria %(gmail_mail_address)s -en"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "E-posta berri %d duzu"
+msgstr[1] "%d E-mail berri dituzu"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"Norengandik: %(from_address)s"
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s fitxero bat bidali nahi dizu"
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Ondo jasoa izan da  %(name)s-ren %(filename)s  fitxeroa."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr ""
+"%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Mesedez bete zure kontu berrirako informazioa</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "Session Management support not available (missing gnome.ui module)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Agertarazi leiho bat irakurri gabeko hurrengo mezuarekin"
 
-#: ../src/gajim-remote.py:98
-msgid "Prints a list of all contacts in the roster. Each contact appear on a separate line"
-msgstr "Zerrendan inprimatu kontaktu guztien lista. Kontaktu horiek hainbat lerrotan agertuko dira."
-
-#: ../src/gajim-remote.py:100
-#: ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202
-#: ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218
-#: ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:82
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appear on a "
+"separate line"
+msgstr ""
+"Zerrendan inprimatu kontaktu guztien lista. Kontaktu horiek hainbat lerrotan "
+"agertuko dira."
+
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "kontua"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "Ikusi emandako kontaktuak bakarrik"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Inprimatu erregistratutako kontuen lista"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "egoera"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "mezua"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "egoera mezua"
 
-#: ../src/gajim-remote.py:114
-msgid "change status of account \"account\". If not specified, try to change status of all accounts that have \"sync with global status\" option set"
-msgstr "\"kontua\" kontuaren egoera aldatu. Ez badago zehaztua, saiatu \"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien egoera aldatzen"
+#: ../src/gajim-remote.py:98
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"\"kontua\" kontuaren egoera aldatu. Ez badago zehaztua, saiatu "
+"\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
+"egoera aldatzen"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Txat leihoa erakutsi, honela, kontaktuari mezua bidali diezaiokezu"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
-#: ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "hautatua badago, kontaktua kontu honen kontaktu listatik lortuko da."
 
-#: ../src/gajim-remote.py:129
-msgid "Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Zerrendako kontaktu bati mezu berri bat bidali. Bai OpenPGP kodea eta baita kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
+#: ../src/gajim-remote.py:113
+msgid ""
+"Sends new chat message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Zerrendako kontaktu bati mezu berri bat bidali. Bai OpenPGP kodea eta baita "
+"kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
+"koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "mezuaren edukia"
 
-#: ../src/gajim-remote.py:135
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "pgp giltza"
 
-#: ../src/gajim-remote.py:135
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hautatua badago, kode publikoa erabiliz enkriptatuko da mezua"
 
-#: ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "hautatua badago, mezua kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:142
-msgid "Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Zerrendako kontaktu bati mezu berri bat bidali. Bai OpenPGP kodea eta baita kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
+#: ../src/gajim-remote.py:126
+msgid ""
+"Sends new single message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Zerrendako kontaktu bati mezu berri bat bidali. Bai OpenPGP kodea eta baita "
+"kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
+"koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 msgid "subject"
 msgstr "gaia"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 msgid "message subject"
 msgstr "mezuaren gaia"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "Kontaktuaren JID-a"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Kontuaren izena"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Fitxero bat bidali kontaktu bati"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "fitxeroa"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "Hautatua badago, fitxero hau kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Erakutsi preferentzia eta balio guztiak"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Preferentziako aukera ezabatu"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "giltza"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "preferentziaren izena borratzeko"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim-en berezko preferentzien egoera .config fitxategian idatzi"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Zerrendara kontaktua sartu"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 msgid "Adds new contact to this account"
 msgstr "Sartu kontaktu berria kontu honetara"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Oraingo egoera itzuli (Globala, ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:223
-msgid "Returns current status message(the global one unless account is specified)"
-msgstr "Oraingo egoera mezua itzuli(Globala aukeratu ez badago kontu bat aukeratuta)"
+#: ../src/gajim-remote.py:207
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Oraingo egoera mezua itzuli(Globala aukeratu ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Irakurri gabeko mezuen kontaketa itzuli"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+#, fuzzy
+msgid "Opens 'Start Chat' dialog"
 msgstr "Ireki  'Txat-a Hasi' leiho"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 msgid "Starts chat, using this account"
 msgstr "Elkarrizketa hasi, kontu hau rabiliz"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr " XML Konsola"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Galdutako argumentua  \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3416,16 +4079,11 @@ msgstr ""
 "'%s'  ez dago zure zerrendan.\n"
 "Kontua zehaztu mezua bidaltzeko."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "D-Bus bertsioa aurkitugabea: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3434,16 +4092,16 @@ msgstr ""
 "Usage: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Argumentuak:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s ez da aurkitu"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3452,7 +4110,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3461,694 +4119,584 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim-ek Xserver behar du abiarazteko. Uzten..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du "
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du "
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ rutinak ez du libglade sostengatzen"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "GTK+ rutina ezabatu eta instalatu ezazu azken bertsio establea %s hemendik"
-
-#: ../src/gajim.py:65
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Konproba ezazu GTK+ eta  PyGTK  libglade onartzen dutea zure sistemak."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim-ek PySQLite2 behar du abiarazteko"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr "Gajim dagoeneko abiarazi da"
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Beste Gajim prozesu bat abiarazita dagoela dirudi\n"
-"Abiarazi dena den?"
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Baimen hau onartzen al duzu?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "errorea bidaltzen zen bitartean %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Autorizazioa baimendua"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "\"%s\" kontaktuak baimendu dizu bere egoera ikusteko."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Beti deskonektatuta ikusiko duzu."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "\"%s\" ezin izan da kontaktuan jarri"
-
-#: ../src/gajim.py:705
-#: ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
-
-#: ../src/gajim.py:849
-#: ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s orain %s dago: (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Zure pasa-esaldia ez da egokia"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Zure OpenPGP koderik gabe konektatu zara."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "E-posta Berria %(gmail_mail_address)s -en"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "E-posta berri %d duzu"
-msgstr[1] "%d E-mail berri dituzu"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-"\n"
-"Norengandik: %(from_address)s"
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s fitxero bat bidali nahi dizu"
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Ondo jasoa izan da  %(name)s-ren %(filename)s  fitxeroa."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "vCard argitarapena egina"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Zure informazio pertsonala egoki argitaratua izan da."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "vCard argitarapenak hust egin du"
-
-#: ../src/gajim.py:1304
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, saiatu berriro beranduago."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Session Management support not available (missing gnome.ui module)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Log-ak Eraldatzen..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Mesedez itxoin log-a eraldatzen den bitartean...."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Gaia"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "gaiaren izena"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Ezin duzu zure berezko gaia ezabatu"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Txat Pribatua"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Txat Pribatuak"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Ez zaude gela honetan \"%s\" edo \"%s\" joan da."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Txat Taldea"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Txat Taldeak"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Gela honek ez du gairik"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s debekatu da %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr "%s gelan sartu da"
 
 #. No status message
-#: ../src/groupchat_control.py:904
-#: ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s orain %s da"
 
-#: ../src/groupchat_control.py:1022
-#: ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Gela honek ez du gairik"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Gonbidatu  %(contact_jid)s %(room_jid)s. gelara."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073
-#: ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ez du ematen baliozko JID bat denik"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "No such command: /%s (if you want to send this, prefix it with /say)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the room, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "Erabilera:  /%s <nickname|JID> [reason], debekatua JID-a gelatik. Erabiltzen ari den baten izengoitia aldatu egin beharko da, baina ez da aldatu beharko   \"@\" -rik  badu. JID-a jadanik gelan bada, bera botatata izango da. Izengoitiak EZ du onartzen tarterik. "
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
+"of an occupant may be substituted, but not if it contains \"@\". If the JID "
+"is currently in the room, he/she/it will also be kicked. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Erabilera:  /%s <nickname|JID> [reason], debekatua JID-a gelatik. Erabiltzen "
+"ari den baten izengoitia aldatu egin beharko da, baina ez da aldatu "
+"beharko   \"@\" -rik  badu. JID-a jadanik gelan bada, bera botatata izango "
+"da. Izengoitiak EZ du onartzen tarterik. "
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
-msgstr "Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako erabiltzaileari."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+msgstr ""
+"Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
+"erabiltzaileari."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Erabilera: %s, testu leihoa itxi."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
 msgstr "Erabilera: /%s [reason],  itxi leihoa, zergatia erakutsiz behar bada."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current room, optionally providing a reason."
-msgstr "Erabilera: /%s <JID> [reason], gonbidatu JID-a oraingo gelara, aukerazko arrazoi bat emanez. "
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"providing a reason."
+msgstr ""
+"Erabilera: /%s <JID> [reason], gonbidatu JID-a oraingo gelara, aukerazko "
+"arrazoi bat emanez. "
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Erabilera:  /%s <room>@<server>[/nickname], eskaini room@server-era sartzen aukeraz izengoiti bat ezarriz."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Erabilera:  /%s <room>@<server>[/nickname], eskaini room@server-era sartzen "
+"aukeraz izengoiti bat ezarriz."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the room and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "Erabilera: /%s <nickname> [reason], ezabatu izengoitiaren bidez aukeratutako erabiltzailea gelatik eta nahi bada arrazoi bat adierazi. EZ da onartzen espazioak nick-an."
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the room and optionally displays a reason. Does NOT support spaces in "
+"nickname."
+msgstr ""
+"Erabilera: /%s <nickname> [reason], ezabatu izengoitiaren bidez aukeratutako "
+"erabiltzailea gelatik eta nahi bada arrazoi bat adierazi. EZ da onartzen "
+"espazioak nick-an."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current room. Use third person. (e.g. /%s explodes.)"
-msgstr "Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
+msgid ""
+"Usage: /%s <action>, sends action to the current room. Use third person. (e."
+"g. /%s explodes.)"
+msgstr ""
+"Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
+"gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message windowand sends message to the occupant specified by nickname."
-msgstr "Erabilera: /%s <nickname> [message], ireki mezu pribatuko leiho bat eta bidali zehaztutako izengoitiaren erabiltzailera."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Erabilera: /%s <nickname> [message], ireki mezu pribatuko leiho bat eta "
+"bidali zehaztutako izengoitiaren erabiltzailera."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Erabilera:  /%s <nickname>, aldatu zure izengoitia gela hontan."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "Erabilera:/%s , erakutsarazi gelako pertsonen izenak."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
-msgstr "Erabilera: /%s [topic], erakuts arazi edo aktualizatu oraingo gelako gaia."
+msgstr ""
+"Erabilera: /%s [topic], erakuts arazi edo aktualizatu oraingo gelako gaia."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Erabilera:  /%s <message>, mezu bat bidali beste komandoak bilatu gabe."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Erabilera:  /%s <message>, mezu bat bidali beste komandoak bilatu gabe."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ez dago laguntza informazioa  /%s -rentzat"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "E_z galdetu berriro  "
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Gaia Aldatu"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Izengoitia Aldatu"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Talde agenda ezarria"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "\"%s\" gela zure talde agendan dago."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Talde agenda egoki sortu da"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
+msgstr ""
+"Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: ../src/groupchat_control.py:1501
-#: ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Programazio errore bat detektatu da"
 
-#: ../src/gtkexcepthook.py:52
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Seguraski ez da garrantzitsua, baina diseinatzailei abisatu beharko litzateke."
+#: ../src/gtkexcepthook.py:42
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Seguraski ez da garrantzitsua, baina diseinatzailei abisatu beharko "
+"litzateke."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Report Bug"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Zehaztapenak"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154
-#: ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Errorea fitxeroa analizatzean:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
-msgstr "ezin izan da  %s-ri idatzi. Sesio administratzailea euskarria ez dago lanean."
+msgstr ""
+"ezin izan da  %s-ri idatzi. Sesio administratzailea euskarria ez dago lanean."
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Irudia ezin izan da %(type)s formatuan gorde. Gorde %(new_filename)s bezala?"
+msgstr ""
+"Irudia ezin izan da %(type)s formatuan gorde. Gorde %(new_filename)s bezala?"
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 msgid "Save Image as..."
 msgstr "Gorde Irudia Bezala..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Ezin izan da aurkitu log-en datu basea"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Kontaktua"
 
 #. holds time
-#: ../src/history_manager.py:117
-#: ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:123
-#: ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Izengoitia"
 
 #. holds message
-#: ../src/history_manager.py:131
-#: ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Mezua"
 
 #. holds subject
-#: ../src/history_manager.py:138
-#: ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Gaia"
 
-#: ../src/history_manager.py:183
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Garbitu nahi al duzu datu basea?(EZ DA GOMENDATZEN GAJIM ABIARAZIA BADAGO)"
+#: ../src/history_manager.py:182
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Garbitu nahi al duzu datu basea?(EZ DA GOMENDATZEN GAJIM ABIARAZIA BADAGO)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Normalean hautaturiko datu basearen tamaina ez da libratuko, ezta ere berrerabilgarri bihurtuko. Datu basearen tamaina gutxitu nahi baduzu, BAI sakatu, bestela EZ.\n"
+"Normalean hautaturiko datu basearen tamaina ez da libratuko, ezta ere "
+"berrerabilgarri bihurtuko. Datu basearen tamaina gutxitu nahi baduzu, BAI "
+"sakatu, bestela EZ.\n"
 "\n"
 "BAI sakatu baduzu, mesedez itxoin..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Historialeko Log-ak Esportatzen...."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s-ean esan du: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "zein"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Ziur al zaude hautaturiko kontaktuaren log-a ezabatu nahi duzula?"
-msgstr[1] "Ziur al zaude hautaturiko kontaktuaren log-ak ezabatu nahi dituzula?"
+msgstr[1] ""
+"Ziur al zaude hautaturiko kontaktuaren log-ak ezabatu nahi dituzula?"
 
-#: ../src/history_manager.py:509
-#: ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Itzulgaitza den operazio bat da hau."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 msgstr[1] "Ziur al zaude hautaturiko mezuak ezabatu nahi dituzula?"
 
-#: ../src/history_window.py:102
-#: ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Elkarrizketa Historiala %s-rekin"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s orain %(status)s dago: %(status_msg)s"
 
-#: ../src/history_window.py:262
-#: ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Mezuak"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Egoera Aldatu du"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Konektatuta"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Deskonektatuta"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Mezu Pribatu Berri Bat %s gelatik"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Ezin izan da irudia kargatu"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Gonbidapena Jasoa"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "Konexiorik gabe ezin duzu zure kontaktuaren informazioa ezarri."
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "vCard argitarapenak hust egin du"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, "
+"saiatu berriro beranduago."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Konexiorik gabe ezin duzu zure kontaktu informazioa lortu."
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: ../src/roster_window.py:288
-#: ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Begiratzaileak"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "%s gelan zaude dagoeneko"
-
-#: ../src/roster_window.py:548
-#: ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "%s kontura"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "%s kontua erabiliz"
@@ -4156,313 +4704,333 @@ msgstr "%s kontua erabiliz"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763
-#: ../src/systray.py:193
-#: ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "%s kontua erabiliz "
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "%s kontukoa"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Talde Agenda Moldatu..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "%s konturako"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Historial Administratzailea"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "Gela Berrian _Sartu"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Txat Taldean Sartu"
+
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr ""
+"Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:1159
-msgid "You will no longer be able to send and receive messages to contacts from this transport."
-msgstr "You will no longer be able to send and receive messages to contacts from this transport."
+#: ../src/roster_window.py:1263
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
+msgstr ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "\"%s\" transportea ezabatu da"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP Kodea Izendatu"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Gela Berria"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Nire zerrendara nahi nizuke sartu"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "_Berrizenpetu"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Log aktibatua"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "Log _desaktibatua"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:1826
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Kontaktua ezabatuz bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta ikusiko zaitu beti."
+#: ../src/roster_window.py:2329
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Kontaktua ezabatuz bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak "
+"deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1830
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak deskonektatuta ikusiko zaitu beti."
+#: ../src/roster_window.py:2333
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
+"deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Kontaktua ezabatuz bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak "
+"deskonektatuta ikusiko zaitu beti."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Gorde pasa-esaldia"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
 
-#: ../src/roster_window.py:1963
-#: ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:1964
-#: ../src/roster_window.py:2021
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
+"honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 msgid "You must create an account before you can chat with other contacts."
-msgstr "Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
+msgstr ""
+"Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: ../src/roster_window.py:2452
-#: ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Irakurri gabeko mezu bat duzu"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453
-#: ../src/roster_window.py:2459
-msgid "Messages will only be available for reading them later if you have history enabled."
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+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:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Bidali %s taldea %s-era"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Egin %s eta %s metacontacts"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Egoera Mezua Aldatu..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Ezkutatu Menua"
-
-#: ../src/systraywin32.py:261
-#: ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d mezu irakurri gabe"
-msgstr[1] "Gajim - %d irakurri gabeko mezuak"
-
-#: ../src/tooltips.py:326
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d mezu irakurri gabe"
-msgstr[1] "%d mezu irakurri gabe"
-
-#: ../src/tooltips.py:332
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d mezu irakurri gabe"
-msgstr[1] "%d irakurri gabeko mezuak"
-
-#: ../src/tooltips.py:338
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d  txat taldeko mezua irakurri gabe"
-msgstr[1] "%d txat taldeko mezuak irakurri gabe"
-
-#: ../src/tooltips.py:344
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d mezu pribatu irakurri gabe"
-msgstr[1] "%d mezu pribatu irakurri gabe"
-
-#: ../src/tooltips.py:359
-#: ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Eginkizun:"
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Afizioak: "
 
-#: ../src/tooltips.py:398
-#: ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Baliabideak: "
 
-#: ../src/tooltips.py:407
-#: ../src/tooltips.py:540
-#: ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Egoera: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Harpidetza: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Egoera: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Azken egoera %s-ean"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Noiztik %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "noiztik %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Deskargatu"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Kargatu"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Mota: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Transferitua:"
 
-#: ../src/tooltips.py:654
-#: ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Hasigabea"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Gelditua"
 
-#: ../src/tooltips.py:660
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Osatua"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Tranferitzen"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Zerbitzu honek ez du oraindik erantzun informazio zehaztuz."
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4470,77 +5038,73 @@ msgstr ""
 "Zerbitzu honek ezin izan du erantzun.\n"
 "Seguraski ez du erantzun espero bezala edo ez dabil."
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Ezin izan da irudia kargatu"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "noiztik %s"
 
-#: ../src/vcard.py:332
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude haren egoera informazioan interesatuta"
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Afizioak: "
 
-#: ../src/vcard.py:334
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan interesik"
+#: ../src/vcard.py:265
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
+"haren egoera informazioan interesatuta"
+
+#: ../src/vcard.py:267
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
+"interesik"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 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:338
-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:271
+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:347
+#: ../src/vcard.py:279
 msgid "You are waiting contact's answer about your subscription request"
-msgstr "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
+msgstr ""
+"Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: ../src/vcard.py:359
-#: ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
-#: ../src/vcard.py:458
-msgid "Without a connection you can not publish your contact information."
-msgstr "Konexiorik gabe ezin duzu zure kontaktuaren informazioa ezarri."
-
-#: ../src/vcard.py:491
-msgid "Without a connection, you can not get your contact information."
-msgstr "Konexiorik gabe ezin duzu zure kontaktu informazioa lortu."
-
-#: ../src/vcard.py:495
-msgid "Personal details"
-msgstr "Informazio pertsonala"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "logs-en datu basea sortzen"
 
-#: ../src/common/check_paths.py:82
-#: ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
 #: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s fitxero bat da baina direktorio bat izan daiteke"
 
-#: ../src/common/check_paths.py:83
-#: ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
 msgid "Gajim will now exit"
 msgstr "Gajim orain badago"
 
@@ -4554,51 +5118,43 @@ msgstr "%s direktorio bat da baina fitxero bat izan daiteke"
 msgid "creating %s directory"
 msgstr "%s direktorioa sortzen"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Zerbitzua ez erabilgarri: Gajim ez dago abiarazita edota remote_control False egoeran dago"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-bus ez dago ordenagailu honetan edo python moduloak ez daude erabilgarri"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Bus saioa ez dago erabilgarri.\n"
-"Saiatu irakurtzen http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Erabili DBus eta Notification-Daemon jakinarazketak erakusteko."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Ordua minutuetan, zure egoera kanpoan aldatu ondoren."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Kanpoan beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Ordua minutuetan, zure egoera ez erabilgarri aldatu ondoren."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Ez erabilgarri beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
-msgstr "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+#, fuzzy
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"List (space separated) of rows (accounts and groups) that are collapsed"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -4608,353 +5164,651 @@ msgstr ""
 "'sometimes' - inprimatu ordua print_ichat_every_foo_minutes minutuko.\n"
 "'never' - inoiz ez inprimatu ordua."
 
-#: ../src/common/config.py:84
-msgid "Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one."
-msgstr "1-tik 4-rako baloreak eman fuzziness-ri eta 0 fuzzyclock ezintzeko. 1 ordu zehatzena da, 4 berriz, zehaztasun gutxienekoa."
+#: ../src/common/config.py:90
+#, fuzzy
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"1-tik 4-rako baloreak eman fuzziness-ri eta 0 fuzzyclock ezintzeko. 1 ordu "
+"zehatzena da, 4 berriz, zehaztasun gutxienekoa."
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:88
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+#: ../src/common/config.py:94
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:98
-msgid "Character to add after nickname when using nick completion (tab) in group chat"
-msgstr "Izengoitiaren ondoren ezartzeko karakterea txat talde batean tab-a erabiltzen bada"
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
+#, fuzzy
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Izengoitiaren ondoren ezartzeko karakterea txat talde batean tab-a "
+"erabiltzen bada"
 
-#: ../src/common/config.py:99
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat"
-msgstr "Izengoitiaren ondoren jartzeko proposatzen den karakterea, txat taldean beste pertsona batek izengoiti berbera badu"
+#: ../src/common/config.py:107
+#, fuzzy
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Izengoitiaren ondoren jartzeko proposatzen den karakterea, txat taldean "
+"beste pertsona batek izengoiti berbera badu"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Sartu * eta [n] zerrendako izenburuan?"
 
-#: ../src/common/config.py:132
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
+#: ../src/common/config.py:141
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
 msgstr "Zenbat lerro gogoarazteko lehengo elkarrizketatik leihoa irikitzean."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
-msgstr "Zenbat minutu izan behar ditu azken lerroak  lehengo elkarrizketaren azkenetik."
+msgstr ""
+"Zenbat minutu izan behar ditu azken lerroak  lehengo elkarrizketaren "
+"azkenetik."
 
-#: ../src/common/config.py:134
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis ICQ Client default behaviour)."
+#: ../src/common/config.py:143
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis "
+"ICQ Client default behaviour)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Hautatua badago, Gajim gajim-remote erabiliz kontrolatu daiteke."
 
-#: ../src/common/config.py:145
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes"
-msgstr "Ez denean ordua mezu bakoitzeko inprimatzen (print_time==sometimes), imprimatu x minuturo"
+#: ../src/common/config.py:154
+#, fuzzy
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Ez denean ordua mezu bakoitzeko inprimatzen (print_time==sometimes), "
+"imprimatu x minuturo"
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Galdetu leiho bat itxi baino lehen."
 
-#: ../src/common/config.py:147
-msgid "Always ask before closing group chat tab/window in this space separated list of room jids."
-msgstr "Always ask before closing group chat tab/window in this space separated list of room jids."
+#: ../src/common/config.py:156
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of room jids."
+msgstr ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of room jids."
 
-#: ../src/common/config.py:148
-msgid "Never ask before closing group chat tab/window in this space separated list of room jids."
-msgstr "Never ask before closing group chat tab/window in this space separated list of room jids."
+#: ../src/common/config.py:157
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of room jids."
+msgstr ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of room jids."
 
-#: ../src/common/config.py:151
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Overrides the host we send for File Transfer in case of address translation/port forwarding."
+#: ../src/common/config.py:160
+msgid ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+msgstr ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC estandarrak esaten du KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Erakutsi tab-a bakarrik elkarrizketa bat dagoenean?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Isteko botoila erakutsi tab-ean?"
 
-#: ../src/common/config.py:176
-msgid "A semicolon-separated list of words that will be highlighted in multi-user chat."
-msgstr "A semicolon-separated list of words that will be highlighted in multi-user chat."
+#: ../src/common/config.py:185
+msgid ""
+"A semicolon-separated list of words that will be highlighted in multi-user "
+"chat."
+msgstr ""
+"A semicolon-separated list of words that will be highlighted in multi-user "
+"chat."
 
-#: ../src/common/config.py:177
-msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used."
-msgstr "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used."
+#: ../src/common/config.py:186
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Egia bada, Gajim-ek erregistratuko du xmpp:/ abiaraztean."
 
-#: ../src/common/config.py:179
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Egia bada, Gajim-ek  ikono bat azalaraziko du leiho horretan irakurri gabeko mezuak adieraziz. Gaiaren arabera ikonoa animatua izan daiteke."
+#: ../src/common/config.py:188
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Egia bada, Gajim-ek  ikono bat azalaraziko du leiho horretan irakurri gabeko "
+"mezuak adieraziz. Gaiaren arabera ikonoa animatua izan daiteke."
 
-#: ../src/common/config.py:180
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window"
-msgstr "Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan kontaktuaren izenaren azpian azalduko dira."
+#: ../src/common/config.py:189
+#, fuzzy
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
+"kontaktuaren izenaren azpian azalduko dira."
 
-#: ../src/common/config.py:182
-msgid "If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old."
-msgstr "If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old."
+#: ../src/common/config.py:191
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
 
-#: ../src/common/config.py:183
-msgid "If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message."
-msgstr "Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera aldaketa egiten duenean edo/eta bere egoera mezua."
+#: ../src/common/config.py:192
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera "
+"aldaketa egiten duenean edo/eta bere egoera mezua."
 
-#: ../src/common/config.py:184
-msgid "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If \"all\" Gajim will print all status messages. If \"in_and_out\", gajim will only print FOO enters/leaves room"
-msgstr "izan daiteke \"none\", \"all\" edo  \"in_and_out\". If \"none\", Gajim-ek ez du inprimatuko egoera lerroa txat talde batean partaide batek bere egoera edo egoera mezua aldatzean. \"all\" bada Gajim-ek egoera guztiak inprimatuko ditu. \"in_and_out\" bada, Gajim-ek sarrera/irteerak inprimatuko ditu bakarrik"
+#: ../src/common/config.py:193
+#, fuzzy
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
+"room."
+msgstr ""
+"izan daiteke \"none\", \"all\" edo  \"in_and_out\". If \"none\", Gajim-ek ez "
+"du inprimatuko egoera lerroa txat talde batean partaide batek bere egoera "
+"edo egoera mezua aldatzean. \"all\" bada Gajim-ek egoera guztiak inprimatuko "
+"ditu. \"in_and_out\" bada, Gajim-ek sarrera/irteerak inprimatuko ditu "
+"bakarrik"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr "Ez erakutsarazi transporteen ikurrak."
 
-#: ../src/common/config.py:189
-msgid "If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events."
-msgstr "Hautatu badago eta GTK+ eta PyGTK bertsioak gutxienez 2.8 bertsiokoak badira, make the window flash (the default behaviour in most Window Managers) when holding pending events."
+#: ../src/common/config.py:198
+#, fuzzy
+msgid "Don't show roster in the system taskbar."
+msgstr "Ez erakutsarazi transporteen ikurrak."
 
-#: ../src/common/config.py:191
-msgid "Jabberd1.4 does not like sha info when one join a password protected room. Turn this option to False to stop sending sha info in groupchat presences"
-msgstr "Jabberd1.4 does not like sha info when one join a password protected room. Turn this option to False to stop sending sha info in groupchat presences"
+#: ../src/common/config.py:199
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"Hautatu badago eta GTK+ eta PyGTK bertsioak gutxienez 2.8 bertsiokoak "
+"badira, make the window flash (the default behaviour in most Window "
+"Managers) when holding pending events."
+
+#: ../src/common/config.py:201
+#, fuzzy
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected room. "
+"Turn this option to False to stop sending sha info in group chat presences."
+msgstr ""
+"Jabberd1.4 does not like sha info when one join a password protected room. "
+"Turn this option to False to stop sending sha info in groupchat presences"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window. Note, changing this option requires restarting Gajim before the changes will take effect"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect."
 msgstr ""
 "Kontrolatu leihoa mezu berri bat dagoenean.\n"
 "'always' - Leiho bakarrean jarriko dira mezu guztiak.\n"
 "'never' - Mezu bakoitzak bere leihoa izango du.\n"
 "'peracct' - Kontaktu baten mezuak leiho berera bidaliko dira.\n"
-"'pertype' - Mezuko gaiak(txat edo txat taldekoena adibidez) leiho konkretu batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi behar da"
+"'pertype' - Mezuko gaiak(txat edo txat taldekoena adibidez) leiho konkretu "
+"batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi behar da"
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Gezurra bada, txat leihoan ez duzu abatererik ikusiko "
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Egia bada, ateratzeko botoila sakatzean tab/leihoa itxiko da"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Ezkutatu botoiak txat taldeko leihoan"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Ezkutatu botoilak bi pertsonen txat leihoan "
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Ezkutatu banner-a txat talde leihoan"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Ezkutatu banner-a bi pertsonen txat leihoan "
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "Ezkutatu gelako jendearen zerrenda txat taldeko leihoan"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+#, fuzzy
+msgid "Merge consecutive nickname in chat window."
 msgstr "Elkartu hurren hurreneko izengoitia elkarrizketa leihoan"
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Indentation when using merge consecutive nickame."
 msgstr "Indentation when using merge consecutive nickame"
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+#, fuzzy
+msgid "List of colors that will be used to color nicknames in group chats."
 msgstr "Txat taldeko izengoitietan erabiliko diren koloreen zerrenda"
 
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:241
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu file_transfer_proxies-en  fitxero transferentziarako."
+#: ../src/common/config.py:259
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
+"file_transfer_proxies-en  fitxero transferentziarako."
+
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP ezin da ordenagailu honetan erabili"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Jaten"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Jaten ari naiz, utzi mezu bat beraz."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Filmea"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Lanean"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "kanpoan"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Kanpoan naiz bizitza disfrutatzen"
 
-#: ../src/common/config.py:312
-msgid "Sound to play when a MUC message contains one of the words in muc_highlight_words, or when a MUC message contains your nickname."
-msgstr "Soinua bat entzun MUC-ak muc_highlight_words-eko hitz bat agertzean edota MUC-aren mezu batek zure izengoitia duenean."
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Libre"
 
-#: ../src/common/config.py:313
-msgid "Sound to play when any MUC message arrives. (This setting is taken into account only if notify_on_all_muc_messages is True)"
-msgstr "Soinu bat entzun MUC mezu bat jasotzean. (Aukera hau bakarrik kontuan hartzen da kontuaren notify_on_all_muc_messages True bada)"
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/config.py:321
-#: ../src/common/optparser.py:185
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Ez Erabilgarri"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
+msgid ""
+"Sound to play when a MUC message contains one of the words in "
+"muc_highlight_words, or when a MUC message contains your nickname."
+msgstr ""
+"Soinua bat entzun MUC-ak muc_highlight_words-eko hitz bat agertzean edota "
+"MUC-aren mezu batek zure izengoitia duenean."
+
+#: ../src/common/config.py:368
+msgid ""
+"Sound to play when any MUC message arrives. (This setting is taken into "
+"account only if notify_on_all_muc_messages is True)"
+msgstr ""
+"Soinu bat entzun MUC mezu bat jasotzean. (Aukera hau bakarrik kontuan "
+"hartzen da kontuaren notify_on_all_muc_messages True bada)"
+
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "berdea"
 
-#: ../src/common/config.py:325
-#: ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "gizakia"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "arrantzale"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr "Ez izan da idle modulua kargatu"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Pasa-esaldi okerra"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Erregistroaren informazioa transporteetarako %s ez da denboran iritsi"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Izengoitia aurkitugabea: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Ezin da gela honetara sartu"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Pasahitza behar da gela onetan sartzeko."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Gela honetan ukatua izan zara."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Honako gela honek ez du existitzen."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "Gela sortzea mugatua dago."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Erregistratutako izengoitia erabilia izan behar da."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Ez zaude kideen zerrendan."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
+"Mesedez ezarri beste izengoiti bat:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Nire zerrendara gehitu nahi zaitut."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "%s -ra harpidetuak gaude orain"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Harpidetza kentzekoa eskaera %s -tik"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "%s -ren harpidetzatik kenduta gaude"
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
+msgstr ""
+"Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
 
-#: ../src/common/connection.py:185
-#: ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Erantzun baliogabea"
 
-#: ../src/common/connection.py:397
-#: ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "%s zerbitzarira konektatu: %s %s -ekin"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Begira ezazu zure konexioa edo saiatu berriro"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP pasa-esaldia ez da eman"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "%s konektatu behar zara OpenPGP-rik gabe."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "ikusezin"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "deskonektatuta"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "%s naiz"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4963,293 +5817,560 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795
-#: ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Nire zerrendara gehitu nahi zaitut."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
-msgid "Unable to load idle module"
-msgstr "Ez izan da idle modulua kargatu"
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Erregistroaren informazioa transporteetarako %s ez da denboran iritsi"
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Gajim-en D-Bus gaitasun funtzioa ezin da erabili"
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Ezin da gela honetara sartu"
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Pasahitza behar da gela onetan sartzeko."
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Zerbitzua ez erabilgarri: Gajim ez dago abiarazita edota remote_control "
+"False egoeran dago"
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Gela honetan ukatua izan zara."
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr ""
+"D-bus ez dago ordenagailu honetan edo python moduloak ez daude erabilgarri"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Honako gela honek ez du existitzen."
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Bus saioa ez dago erabilgarri.\n"
+"Saiatu irakurtzen http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "Gela sortzea mugatua dago."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Ezer ez"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Erregistratutako izengoitia erabilia izan behar da."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "zein"
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Ez zaude kideen zerrendan."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Kalea:"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "norentzat"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "fitxeroa"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
 msgstr ""
-"Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
-"Mesedez ezarri beste izengoiti bat:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "%s -ra harpidetuak gaude orain"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Gertaera"
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Harpidetza kentzekoa eskaera %s -tik"
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s -ren harpidetzatik kenduta gaude"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Jarraitu"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Ezabatu"
 
-#: ../src/common/connection_handlers.py:1680
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
+msgid "%0 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "%s -ra erregistratua"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Lanean"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Ezer ez"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Gertaera"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Baliogabeko karakterea izenean."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Zerbitzariaren helbidea behar da."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Baliogabeko karakterea hostname -ean."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gib"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "Lan_petuta"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "Ez E_rabilgarri"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Ez Erabilgarri"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "Libre _Hitz Egiteko"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Libre"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Libre"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "_Kanpoan"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Kanpoan"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Deskonektatuta"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "Ikuse_zin"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "Ezin da jakin"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "Errorea du"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Norentzat"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "-etik"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Biak"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Moderatzaileak"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Moderatzailea"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Partaideak"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Bisitariak"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Bisitaria"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Inor ez"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Jabea"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administratzailea"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Partaidea"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "arreta jartzen ari da elkarrizketara"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "beste zerbait egiten ari da"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "mezu bat sortzen ari da..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "mezuaren sorrera gelditua"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
+#: ../src/common/helpers.py:871
+#, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "%d mezu irakurri gabe"
+msgstr[1] "%d mezu irakurri gabe"
+
+#: ../src/common/helpers.py:877
+#, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "%d mezu irakurri gabe"
+msgstr[1] "%d irakurri gabeko mezuak"
+
+#: ../src/common/helpers.py:883
+#, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "%d  txat taldeko mezua irakurri gabe"
+msgstr[1] "%d txat taldeko mezuak irakurri gabe"
+
+#: ../src/common/helpers.py:889
+#, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "%d mezu pribatu irakurri gabe"
+msgstr[1] "%d mezu pribatu irakurri gabe"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180
-#: ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "cyan"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "logs-en datu basea sortzen"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "%s kontukoa"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Ezin izan da irudia kargatu"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Ezin izan da konektatu \"%s\" -rekin"
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Mezu hau enkriptatua dago]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Harpidetu"
+
+#~ msgid "Add"
+#~ msgstr "Gehitu"
+
+#~ msgid "Away "
+#~ msgstr "Kanpoan"
+
+#~ msgid "Down"
+#~ msgstr "Bera"
+
+#~ msgid "List of special notifications settings"
+#~ msgstr "Notifikazio berezien aldaketen zerrenda"
+
+#~ msgid "Not Available "
+#~ msgstr "Ez Erabilgarri"
+
+#~ msgid "Up"
+#~ msgstr "Gora"
+
+#~ msgid "Default"
+#~ msgstr "Berezkoa"
+
+#~ msgid "Create your own Privacy Lists"
+#~ msgstr "Sortu zure debekatze zerrenda"
+
+#~ msgid "Server-based Privacy Lists"
+#~ msgstr "Zerbitzarian oinarritutako Debekatze Zerrenda"
+
+#~ msgid "Contact _Info"
+#~ msgstr "Kontaktuaren _ Informazioa"
+
+#~ msgid "Contact Information"
+#~ msgstr "Kontaktuaren Informazioa"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Baliogabeko gela edo zerbitzari izena"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "D-Bus bertsioa aurkitugabea: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "vCard argitarapena egina"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Zure informazio pertsonala egoki argitaratua izan da."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Log-ak Eraldatzen..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Mesedez itxoin log-a eraldatzen den bitartean...."
+
+#~ msgid "_Join New Room"
+#~ msgstr "Gela Berrian _Sartu"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Ezkutatu Menua"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d mezu irakurri gabe"
+#~ msgstr[1] "Gajim - %d irakurri gabeko mezuak"
+
+#~ msgid "Since %s"
+#~ msgstr "Noiztik %s"
diff --git a/po/fr.po b/po/fr.po
index 0a9ee695a..fdd1b5334 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,12 +4,12 @@
 #
 # See: http://live.gnome.org/GnomeFr/Traduire for translation guidelines
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-04-20 17:23+0100\n"
 "Last-Translator: Yann Le Boulanger <asterix@lagaule.org>\n"
 "Language-Team: \n"
@@ -20,15 +20,15 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Messagerie instantanée Gajim"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Client de MI Jabber"
 
@@ -45,16 +45,23 @@ msgid "_Discover Services..."
 msgstr "_Découvrir les services..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Salons de discussion"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modifier le compte..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Ouvrir le logiciel de Courriel"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "É_tat"
 
@@ -110,7 +117,7 @@ msgid "Pass_word:"
 msgstr "_Mot de passe : "
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Enregistrer le mot de _passe"
 
@@ -135,7 +142,7 @@ msgid "Your JID:"
 msgstr "Votre identifiant Jabber :"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Avancées"
 
@@ -149,7 +156,7 @@ msgid "_Host:"
 msgstr "_Serveur :"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "Mot de _passe : "
 
@@ -181,10 +188,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Divers</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informations personnelles</b>"
 
@@ -201,6 +210,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Reconnexion automatique quand la connexion est perdue"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "C_onnexion au démarrage"
 
@@ -216,11 +226,12 @@ msgid ""
 "be disabled"
 msgstr ""
 "Si vous cochez cette case, Gajim se connectera sur le port 5223, sur lequel "
-"les serveurs sont supposés gérer le SSL. Notez que Gajim utilise le chiffrement "
-"TLS par défaut si le serveur annonce qu'il le supporte, et avec cette option "
-"vous désactivez le TLS"
+"les serveurs sont supposés gérer le SSL. Notez que Gajim utilise le "
+"chiffrement TLS par défaut si le serveur annonce qu'il le supporte, et avec "
+"cette option vous désactivez le TLS"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Choisissez une _clé..."
 
@@ -237,16 +248,16 @@ msgid "Edit Personal Information..."
 msgstr "_Éditer les informations personnelles..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Général"
 
@@ -271,6 +282,7 @@ msgstr ""
 "pour prévenir des temps de latence pouvant entraîner des déconnexions"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -279,6 +291,7 @@ msgstr ""
 "config avec accès en lecture pour vous uniquement"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -287,6 +300,7 @@ msgstr ""
 "à jabber en utilisant ce compte"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -304,18 +318,23 @@ msgstr "Les informations vous concernant, stockées sur le serveur"
 msgid "Manage..."
 msgstr "Gérer..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Aucun"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
@@ -338,14 +357,18 @@ msgstr ""
 "client ayant la plus haute priorité recevra les messages"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy :"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Ressour_ce: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -359,40 +382,46 @@ msgstr ""
 "en même temps. La ressource avec la plus haute priorité recevra les messages "
 "(voir plus bas)."
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Enregistrer votre mot de _passe (non sécurisé)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Garder l'_historique des conversations pour tous les contacts"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Envoi des paquets de maintien de connexion"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_roniser l'état du compte avec l'état global"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Utiliser _SSL"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Utiliser un nom d'hôte/port personnalisé"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Utiliser les proxies pour les transferts de fichiers"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "Identifiant _Jabber : "
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Nom : "
 
@@ -402,58 +431,88 @@ msgstr "Comptes"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Si vous avez 2 comptes ou plus et que cette case est cochée, Gajim va lister "
 "tous les contacts comme si vous n'aviez qu'un seul compte"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Regrouper les comptes"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Modifier"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Supprimer"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
+#, fuzzy
+msgid "A_ccount:"
+msgstr "_Compte :"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
 msgid "A_llow this contact to view my status"
 msgstr "_Autoriser ce contact à voir mon état"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Ajouter un nouveau contact"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-msgid "_Account:"
-msgstr "_Compte :"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 msgid "_Group:"
 msgstr "_Groupe :"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 msgid "_Nickname:"
 msgstr "_Surnom :"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 msgid "_Protocol:"
 msgstr "_Protocole :"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Ajouter"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "_Souscrire"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 msgid "_User ID:"
 msgstr "_Identifiant :"
 
@@ -541,74 +600,58 @@ msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
-msgid "Add"
-msgstr "Ajouter"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
 msgid "Advanced Actions"
 msgstr "Actions avancées"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 msgid "Advanced Notifications Control"
 msgstr "Éditeur de configuration avancée"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 msgid "All Status "
 msgstr "Tous les états "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr "Et je "
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-msgid "Away "
-msgstr "Absent "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
+msgstr "Absent"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 msgid "Busy "
 msgstr "Occupé "
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr "N'ai pas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Télécharger"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr "Ai"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "commande"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Ajout de notifications spéciales pour %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid "Not Available "
-msgstr "Non disponible "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
+msgstr "Non disponible"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 msgid "Online / Free For Chat"
 msgstr "En ligne / Disponible pour discuter"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 msgid "Play a sound"
 msgstr "Jouer un son"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -621,75 +664,76 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr "Haut"
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr "Quand"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Cacher les boutons dans la fenêtre des salons"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Utiliser une seule fenê_tre de discussion avec des onglets"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Ne le montrer que dans la _liste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Ne le montrer que dans la _liste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+#, fuzzy
+msgid "and I "
+msgstr "Et je "
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Port : "
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -724,7 +768,7 @@ msgstr "Rejoindre un _salon de discussion"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Ajouter à la liste de contacts"
 
@@ -745,7 +789,8 @@ msgid "_Open Link in Browser"
 msgstr "_Ouvrir le Lien dans votre navigateur"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "Commencer une _discussion"
@@ -755,7 +800,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Cliquez ici pour voir les précédentes conversations avec ce contact"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Envoyer un _fichier"
 
@@ -771,7 +817,8 @@ msgstr "Vue _Compacte    Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historique"
 
@@ -839,7 +886,7 @@ msgstr ""
 "Quand le transfert de fichier est terminé, montrer une fenêtre de "
 "notification"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Continuer"
 
@@ -876,39 +923,34 @@ msgstr ""
 "Bannière"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Actif"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Gras"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "En train d'écrire"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Style de la police :"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Personalisation des thèmes de Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Parti"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Inactif"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Italique"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -916,7 +958,7 @@ msgstr ""
 "Messages\n"
 "de salon"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -925,19 +967,19 @@ msgstr ""
 "Dirigés dans\n"
 "les salons"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Pause"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "_Couleur du texte :"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "_Police du texte :"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Arrière-plan :"
 
@@ -1058,7 +1100,7 @@ msgid "Accept"
 msgstr "Accepter"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Refuser"
 
@@ -1066,13 +1108,14 @@ msgstr "Refuser"
 msgid "Invitation Received"
 msgstr "Invitation reçue"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Rejoindre un salon de discussion"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Surnom :"
 
@@ -1090,13 +1133,8 @@ msgstr "Récemment :"
 msgid "Room:"
 msgstr "Salon :"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Serveur :"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "Re_joindre"
 
@@ -1121,6 +1159,10 @@ msgstr "Gérer les Marque-pages"
 msgid "Print status:"
 msgstr "Afficher l'heure :"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Serveur :"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Titre :"
@@ -1142,7 +1184,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Gérer les profils de proxies"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Nom :"
 
@@ -1158,20 +1201,21 @@ msgstr "Utiliser l'authentification"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Cliquer pour insérer un émoticône (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "Chiffrement OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "Ac_tions"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "En_voyer"
 
@@ -1247,18 +1291,25 @@ msgid "Also known as iChat style"
 msgstr "Aussi appellé style iChat"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Demander le message d'état lorsque je me : "
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Passer _absent après :"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Passer _indisponible après :"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1270,19 +1321,19 @@ msgstr ""
 "Toujours utiliser les applications par défaut de KDE\n"
 "Personnalisé"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "Avant le surnom :"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Discussion"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Noti_fications d'état de discussion"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1292,35 +1343,40 @@ msgstr ""
 "vous spamme/ennuie. Utilisez la avec précaution, car elle bloque tous les "
 "messages des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Message d'état"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "_Icônes d'état par défaut :"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Afficher l'a_vatar des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Afficher les _messages d'état des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "Toutes les 5 minutes"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Émoticônes :"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Événements"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1330,14 +1386,14 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quel état de conversation vous voulez envoyer à vos contacts."
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Gajim montrera automatiquement les nouveaux évènements reçus en montrant la "
 "fenêtre correspondante"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1345,7 +1401,7 @@ msgstr ""
 "Gajim vous signalera les nouveaux évènements dans une fenêtre en bas à "
 "droite de l'écran"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1353,7 +1409,7 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est connecté"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1361,13 +1417,19 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est déconnecté"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim ne fera que changer l'icône du contact qui a envoyé le nouvel évènement"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1375,7 +1437,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1383,7 +1445,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1391,7 +1453,7 @@ msgstr ""
 "Si cette case est cochée, Gajim va retenir la position de votre liste "
 "decontacts et des fenêtres de discussion pour vos prochaines utilisations"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1401,7 +1463,7 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent, occupé, etc)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1409,11 +1471,11 @@ msgstr ""
 "Si cette case n'est pas décochée, Gajim va remplacer les émoticône ASCII "
 "comme « :) » par un équivalent graphique statique ou dynamique"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "_Gérer..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1425,82 +1487,86 @@ msgstr ""
 "Par compte\n"
 "Par type"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Me Signaler quand un contact se : "
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Me prévenir lorsqu'un nouveau courrier électronique _Gmail arrive"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "À _chaque message"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "Une seule fenêtre de discussion :"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "_Jouer les sons"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Afficher l'heure :"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Garder la _position et la taille pour la liste de contact et les fenêtres de "
 "discussion"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Ne le montrer que dans la _liste"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_connecte"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_déconnecte"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "État"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "T_hème :"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Le message automatique pour l'état \"absent\""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Le message automatique pour l'état \"non disponible\""
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Utiliser les icônes des passere_lles"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Icône dans la zone de notification (trayicon)"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1512,151 +1578,160 @@ msgstr ""
 "informer. NB : Les événements de nouveau message ne surviennent que s'ils "
 "proviennent d'un contact avec qui vous n'êtes pas déjà en train de parler"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Quand un nouvel événement est reçu"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Éditeur de configuration avancée"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "_Après l'heure :"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "A_vant l'heure :"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "Gestionnaire de _fichiers :"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Police :"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Souligner les fautes d'orthographe"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer les messages des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "Message _entrant :"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Inscrire dans l'historique les changements d'état des contacts"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "Logiciel de courriel :"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Jamais"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "Me le _signaler"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "Message s_ortant :"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Programme pour lire les sons :"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "L'_afficher"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "Utilise_r les Couleurs par Défaut"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "Trier les contacts par _statut"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "Message d'état :"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL :"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minutes"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Conversations privées"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Format d'une ligne de discussion</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "C_onnexion au démarrage"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Supprimer"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Identifiant Jabber :"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Serveur :"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Liste des Bannis"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Autorisation"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "Dans le groupe"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1664,32 +1739,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Envoyer un message"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Lui demander à voir son état"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "L'autoriser à voir mon état"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "À propos"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adresse"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Choisir un _avatar"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Anniversaire :"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Ville :"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Entreprise :"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Pays :"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Département :"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Courriel :"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Adresse 2 :"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Famille :"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Format : AAAA-MM-JJ"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Prénom :"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Site perso :"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Second prénom :"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Complément"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Informations personnelles"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Téléphone :"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Poste :"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Code postal :"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Titre :"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Fonction :"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "État :"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Rue :"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Suffixe :"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Emploi"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Publier"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Récupérer"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1709,47 +1924,58 @@ msgid "A_sk to see his/her status"
 msgstr "Lui demander à voir son état"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Ajouter une notification spéciale"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Assigner une clé Open_PGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Éditer les _groupes"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Envoyer un _message simple"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Commencer une _discussion"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "L'autoriser à voir mon état"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Lui interdire de voir mon état"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Enlever de la liste de contacts"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Autorisation"
 
@@ -1774,42 +2000,53 @@ msgid "Help online"
 msgstr "Aide en ligne"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Profil, _Avatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Passerelles"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Montrer les contacts déc_onnectés"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Découvrir les services"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Quitter"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_S'exprimer"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "Parc_ourir"
@@ -1879,24 +2116,20 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Autoriser le contact à savoir quand vous êtes connecté"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "_Informations"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Refuser l'autorisation au contact pour qu'il ne puisse pas savoir quand vous "
 "êtes connecté"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Requête d'Inscription"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Autoriser"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Refuser"
 
@@ -1912,164 +2145,51 @@ msgstr "Montrer la _liste de contacts"
 msgid "Sta_tus"
 msgstr "É_tat"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "À propos"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adresse"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Demande :"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Anniversaire :"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Ville :"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Client :"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Entreprise :"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Informations"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Pays :"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Département :"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "Courriel :"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Adresse 2 :"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Famille :"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Format : AAAA-MM-JJ"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Prénom :"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Site perso :"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Contacts"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Identifiant Jabber :"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Adresse"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Second prénom :"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Complément"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "Syst. d'exploit. :"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Téléphone :"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Poste :"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Code postal :"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Titre :"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ressource :"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Fonction :"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Choisir un _avatar"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "État :"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "État :"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Rue :"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Inscription :"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Suffixe :"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Emploi"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Historique de Conversation"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Publier"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Récupérer"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafic Jabber</b>"
@@ -2101,30 +2221,165 @@ msgstr "_Message"
 msgid "_Presence"
 msgstr "_Présence"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Nom :"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Nom :"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Informations Personnelles"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Modifier le compte..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Utiliser un nom d'hôte/port personnalisé"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Option"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Valeur"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Aucune)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Éléments masqués"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Général"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "Vert"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Adresse"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Italique"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Publier"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2140,53 +2395,63 @@ msgstr ""
 "\n"
 "La vérification orthographique ne sera pas utilisée"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Votre message ne peut être envoyé tant que vous n'êtes pas connecté."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Discussions"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s : %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s n'a pas envoyé de clé OpenPGP et vous ne lui en avez pas assigné une"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Chiffrement activée"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Chiffrement désactivée"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "Absent de la liste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vous venez de recevoir un nouveau message de \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2194,227 +2459,272 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Toutes les %s _minutes"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Actif"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Aucune connexion disponible"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "texte du message d'état :"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Premier Message Reçu"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Message Suivant Reçu"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Contacte Connecté"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Contacte Déconnecté."
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Message Envoyé"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Message d'un Salon Reçu"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Pour changer le nom du compte, vous devez être déconnecté."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Événements non lus"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr "Pour changer le nom du compte, vous devez lire tous ses évènements."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Nom de Compte déjà utilisé"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ce nom est déjà utilisé par un autre de vos comptes. Choisissez un autre nom."
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un Identifiant Jabber doit être de la forme \"user@servername\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Revient de suite."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Reconnecter maintenant ?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Si vous voulez que vos changements soit appliqués immédiatement, vous devez "
 "vous reconnecter."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 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:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "Vous devez d'abord créer votre compte avant d'éditer vos informations."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Il y a eut un problème durant la récupération de vos clés OpenPGP secrètes."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Sélection d'une clé OpenPGP"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Lisez tous les évènements avant de supprimer ce compte."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Vous n'avez aucun compte actif"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Nom de Compte déjà utilisé"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Liste des Bannis"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Liste des Membres"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Liste des Propriétaires"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Liste des Administrateurs"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Raison"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Rôle"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Bannissement de ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2422,11 +2732,11 @@ msgstr ""
 "<b>Qui voulez-vous bannir ?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Ajout d'un Membre ..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2434,11 +2744,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un membre ?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Ajout d'un Propriétaire ..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2446,11 +2756,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un propriétaire ?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Ajout d'un Administrateur ..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2458,7 +2768,7 @@ msgstr ""
 "<b>De qui voulez-vous faire un administrateur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2475,88 +2785,89 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nouveau Salon"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Salon de Discussion"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-page"
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Vous devez entrer un nom d'utilisateur pour configurer ce compte."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Vous devez entrer un mot de passe pour enregistrer un nouveau compte."
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Identifiant Jabber dupliqué"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Ce compte est déjà configuré dans Gajim."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2565,23 +2876,23 @@ msgstr ""
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2589,468 +2900,518 @@ msgstr ""
 "Le texte sous cette règle correspond à ce qui a été dit depuis la dernière "
 "fois que vous avez consulté ce salon de discussion"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Actions pour \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Il manque un \"%s\" dans l'URL du dictionnaire et ce n'est pas WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Il manque un \"%s\" dans l'URL de recherche sur Internet"
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Hier"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "Il y a %i jours"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
 
-# Traduction moins mauvaise mais pas terrible: binding=lier, attacher
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "La passerelle python - D-Bus n'est pas installée sur cet ordinateur"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Les possibilités D-Bus de Gajim ne peuvent pas être utilisées"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Nom du contact : <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Groupe"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "Dans le groupe"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "Message d'état %s"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Message d'état"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Enregistrer comme messages d'état prédéfini"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Tapez un nom pour ce message d'état"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Adresse :"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Adresse :"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Adresse 2 :"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Remplissez les informations sur le contact à ajouter au compte %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Passerelles"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Identifiant utilisateur non valide"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Contact déjà dans la liste"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Le contact est déjà dans votre liste."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "_Identifiant :"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Anciens développeurs :"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Anciens développeurs :"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "MERCI :"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Pour finir, nous voulons remercier tous les mainteneurs de paquet."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr ""
 "Yann Le Boulanger <asterix@lagaule.org>\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Requête d'inscription pour le compte %s de la part de %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Vous êtes déjà dans le salon %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Vous ne pouvez joindre un salon de discussion tant que vous n'êtes pas "
 "connecté."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un salon de discussion en tant que %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "nom de salon ou de serveur non-valide"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Identifiant Jabber invalide"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Le nom du salon ou du serveur contient des caractères interdits."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Entrez l'identifiant du contact à qui vous souhaitez\n"
 "envoyer un message"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Nouveau message"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "nouveau courrier électronique"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de Fichier"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Transfert de Fichier Terminé"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Transfert de Fichier Arrêté"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Invitation à un salon"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contact déconnecté"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
+msgstr "Message simple en tant que %s"
+
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Message simple"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Description : %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Format d'une ligne de discussion</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Format d'une ligne de discussion</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Conversations privées"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s vous a invité dans le salon %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quand %s devient :"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Ajout de notifications spéciales pour %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Connexion"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Autres"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Conférences"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour parcourir les services disponibles"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestion des Services du compte %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Le service n'a pu être trouvé"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3058,46 +3419,51 @@ msgstr ""
 "Il n'y a aucun service à l'adresse indiquée, ou bien il ne répond pas. "
 "Veuillez vérifier l'adresse et réessayer."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Le service ne peut pas être parcouru"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Ce type de service ne contient pas d'élément à parcourir."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Parcourt %s en utilisant le compte %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Scanne %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Utilisateurs"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Description"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Fichier"
@@ -3115,7 +3481,7 @@ msgstr "Progression"
 msgid "Filename: %s"
 msgstr "Nom du Fichier : %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Taille : %s"
@@ -3123,17 +3489,17 @@ msgstr "Taille : %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Vous"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Destinataire : "
 
@@ -3154,78 +3520,88 @@ msgstr "Transfert de fichier annulé"
 msgid "Connection with peer cannot be established."
 msgstr "La connexion avec le contact ne peut être établie."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Destinataire : "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Erreur de lecture du fichier :"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Transfert de fichier arrêté par votre contact"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Choisissez un fichier à envoyer..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne peut accéder à ce fichier"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Ce fichier est utilisé par un autre processus."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Fichier : %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Que voulez vous faire ?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Enregistrer le Fichier sous..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3233,58 +3609,260 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Fichier non valide"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Fichier : "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Expéditeur : "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim a besoin d'un serveur X pour s'exécuter. Fermeture..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter."
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter. Fermeture..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim a besoin de GTK 2.6+ pour s'exécuter."
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim a besoin de GTK 2.6+ pour s'exécuter. Fermeture..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "La bibliothèque GTK+ ne contient pas le support de glade"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Supprimez votre version actuelle de la bibliothèque GTK+ et installez la "
+"dernière version stable à partir de %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Vérifiez que GTK+ et PyGTK contiennent le support de glade dans votre "
+"système."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "Autorisation HTTP (%s) pour %s (id : %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Acceptez vous sa requête ?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Connexion"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Sujet : %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "erreur en envoyant %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Autorisation acceptée"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Le contact \"%s\" vous a autorisé à voir son état."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Vous le verrez toujours déconnecté."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Le contact avec \"%s\" ne peut être établi"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Vérifiez votre connexion ou réessayez plus tard."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s est maintenant %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Votre mot de passe est incorrect"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nouvel E-mail sur %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Vous avez %d nouveau courrier électronique"
+msgstr[1] "Vous avez %d nouveaux courriers électroniques"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s souhaite vous envoyer un fichier."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Vous avez bien reçu %(filename)s de la part de %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr ""
+"Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Remplissez les informations pour votre nouveau compte</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Impossible d'enregistrer vos informations de configuration"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "montrer l'aide d'une commande"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "commande"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "montrer l'aide sur la commande"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Montre ou cache la fenêtre principale"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Afficher une fenêtre avec le prochain message non lu"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3292,46 +3870,46 @@ msgstr ""
 "Affiche une liste de tous les contacts de la liste. Chaque contact apparaît "
 "sur une ligne séparée"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "compte"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "montrer seulement les contacts du compte spécifié"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Affiche la liste des comptes enregistrés"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Change l'état du ou des compte(s)"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "état"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "message"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "Message d'état"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3340,21 +3918,21 @@ msgstr ""
 "changer l'état de tous les compte qui ont l'option \"synchroniser avec "
 "l'état global\" activée"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Montre la fenêtre de discussion pour que vous puissiez envoyer un message à "
 "un contact"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID du contact avec lequel vous voulez discuter"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3365,27 +3943,27 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID du contact qui recevra le message"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "contenu du message"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "clé pgp"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Si spécifié, le message sera chiffré en utilisant cette clé public"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "Si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3396,127 +3974,142 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Sujet"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Message Envoyé"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Récupère les informations détaillées d'un contact"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID du contact"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Récupère les informations détaillées d'un compte"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Nom du compte"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Envoyer un fichier à un contact"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "fichier"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Chemin du fichier"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Liste toutes les préférences et leurs valeurs"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Définir la valeur de 'clé' à 'valeur'."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'clé' est le nom de la préférence, 'valeur' est la valeur à assigner"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Supprime une option de préférence"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "touche"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "nom de la préférence a supprimer"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Écrit les préférences actuelles de Gajim dans le fichier .config"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Enlever le contact de la liste"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Ajouter le contact à la liste"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Ajouter un nouveau contact à ce compte."
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Renvoit l'état actuel (global à moins qu'un compte ne soit spécifié)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Renvois le message d'état actuel (global à moins qu'un compte ne soit "
 "spécifié)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Renvois le nombre de messages non-lus"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "Console XML"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3525,16 +4118,11 @@ msgstr ""
 "'%s' n'est pas dans votre liste de contact.\n"
 "Précisez le compte pour envoyer le message."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Vous n'avez aucun compte actif"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Version de dbus inconnue : %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3543,16 +4131,16 @@ msgstr ""
 "Usage: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s non trouvé"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3561,7 +4149,7 @@ msgstr ""
 "Utilisation : %s commande [arguments]\n"
 "commande est l'une de :\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3570,333 +4158,136 @@ msgstr ""
 "L'argument \"%s\" n'est pas précisé. \n"
 "Tappez \"%s help %s\" pour plus d'informations"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim a besoin d'un serveur X pour s'exécuter. Fermeture..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter."
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter. Fermeture..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim a besoin de GTK 2.6+ pour s'exécuter."
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim a besoin de GTK 2.6+ pour s'exécuter. Fermeture..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "La bibliothèque GTK+ ne contient pas le support de glade"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Supprimez votre version actuelle de la bibliothèque GTK+ et installez la "
-"dernière version stable à partir de %s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Vérifiez que GTK+ et PyGTK contiennent le support de glade dans votre "
-"système."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Autorisation HTTP (%s) pour %s (id : %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Acceptez vous sa requête ?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "erreur en envoyant %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Autorisation acceptée"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Le contact \"%s\" vous a autorisé à voir son état."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Vous le verrez toujours déconnecté."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Le contact avec \"%s\" ne peut être établi"
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Vérifiez votre connexion ou réessayez plus tard."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s est maintenant %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Votre mot de passe est incorrect"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Nouvel E-mail sur %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Vous avez %d nouveau courrier électronique"
-msgstr[1] "Vous avez %d nouveaux courriers électroniques"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s souhaite vous envoyer un fichier."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Vous avez bien reçu %(filename)s de la part de %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr ""
-"Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "la vCard a été publiée avec succés"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Vos informations personnelles ont été publiées avec succès."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "échec lors de la publication de votre vCard"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Une erreur s'est produite lors de la publication de vos informations "
-"personnelles, veuillez réessayer plus tard."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Impossible d'enregistrer vos informations de configuration"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Migration de l'historique..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Merci de patienter pendant la migration de l'historique..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Thème"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "nom du thème"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Vous ne pouvez pas supprimer le thème actuellement utilisé"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr ""
 "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Conversation privée"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Vous n'êtes plus dans le salon \"%s\" ou \"%s\" l'a quitté."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Salon de Discussion"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Salons de Discussion"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Changer de sur_nom"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Ce salon n'a pas de sujet"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a été éjecté par %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a été banni par %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s est maintenant %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s est maintenant %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Surnom introuvable : %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Ce salon n'a pas de sujet"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr ""
 "Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s semble ne pas être un JID valide"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Cette commande n'existe pas: /%s (précédez la de /say pour l'envoyer)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Commandes : %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3904,57 +4295,57 @@ msgid ""
 "is currently in the room, he/she/it will also be kicked. Does NOT support "
 "spaces in nickname."
 msgstr ""
-"Utilisation : /%s <surnom|JID> [raison], bannit le JID du salon. Le surnom de "
-"l'occupant peut être utilisé s'il ne contient pas de \"@\". Si le JID est "
+"Utilisation : /%s <surnom|JID> [raison], bannit le JID du salon. Le surnom "
+"de l'occupant peut être utilisé s'il ne contient pas de \"@\". Si le JID est "
 "actuellement dans le salon il sera également éjecté. Ne supporte pas les "
 "espaces dans le surnom."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
-"Utilisation : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
-"spécifié."
+"Utilisation : /%s <surnom>, ouvre une fenêtre de discussion privée avec "
+"l'occupant spécifié."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr ""
-"Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la "
-"raison si spécifiée."
+"Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courrant en "
+"affichant la raison si spécifiée."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
 "providing a reason."
 msgstr ""
-"Utilisation : /%s <JID> [raison], invite le JID dans le salon actuel, la raison "
-"est optionnelle."
+"Utilisation : /%s <JID> [raison], invite le JID dans le salon actuel, la "
+"raison est optionnelle."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr ""
-"Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur "
-"en option on peut spécifier le surnom utilisé."
+"Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre "
+"salon@serveur en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3965,120 +4356,123 @@ msgstr ""
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
 "g. /%s explodes.)"
 msgstr ""
-"Utilisation : /%s <action>, envoie l'action au salon actuel. Utilise la troisième "
-"personne. (ex : /%s explose.)"
+"Utilisation : /%s <action>, envoie l'action au salon actuel. Utilise la "
+"troisième personne. (ex : /%s explose.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
 "message to the occupant specified by nickname."
 msgstr ""
-"Utilisation : /%s <surnom> [message], ouvre une fenêtre de discussion privée et "
-"envoie le message à l'occupant(e) spécifié(e) par le surnom."
+"Utilisation : /%s <surnom> [message], ouvre une fenêtre de discussion privée "
+"et envoie le message à l'occupant(e) spécifié(e) par le surnom."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
-msgstr "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
+msgstr ""
+"Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
-msgstr "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
+msgstr ""
+"Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
-"Utilisation : /%s <message>, envoie un message sans chercher d'autres commandes."
+"Utilisation : /%s <message>, envoie un message sans chercher d'autres "
+"commandes."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Pas d'aide disponible pour /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Si vous fermez cette fenêtre, vous serez déconnecté de ce salon."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "_Ne plus me poser la question"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Marque-page déjà spécifié"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Le salon \"%s\" est déjà dans vos marque-pages."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Marque-page ajouté avec succès"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de "
 "contacts."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Une erreur de programmation a été détectée"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4086,81 +4480,81 @@ msgstr ""
 "Elle n'est probablement pas fatale mais devrait quand même être communiquée "
 "aux développeurs."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Rapporter l'anomalie"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Détails"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Erreur de lecture du fichier :"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Erreur lors de l'analyse du fichier :"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "N'a pas pu écrire dans %s. La gestion des sessions ne foncionnera pas"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enregistrer le Fichier sous..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Impossible de trouver la base de données de l'historique"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Contacts"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Date"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Pseudonyme"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Message"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Sujet"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4168,7 +4562,7 @@ msgstr ""
 "Voulez vous nettoyer la base de donnée ? (TRÈS DÉCONSEILLÉ SI GAJIM EST "
 "LANCÉ)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4182,118 +4576,160 @@ msgstr ""
 "\n"
 "Si vous choisissez OUI, patientez..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Exporte l'historique..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s le %(time)s a dit: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "qui"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Voulez vous réellement supprimer l'historique de ce contact ?"
 msgstr[1] "Voulez vous réellement supprimer l'historique de ces contacts ?"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "C'est une opération irréversible."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Voulez-vous vraiment supprimer le message sélectionné ?"
 msgstr[1] "Voulez-vous vraiment supprimer les messages sélectionnés ?"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historique de Conversation avec %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s est maintenant %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s est maintenant %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s est maintenant %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s s'est connecté"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s s'est déconnecté"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nouveau Message Simple de %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Nouveau Message Privé du Salon %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nouveau Message de %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Impossible de charger l'image"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Invitation reçue"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "Vous devez être connecté pour publier vos informations."
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "échec lors de la publication de votre vCard"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Une erreur s'est produite lors de la publication de vos informations "
+"personnelles, veuillez réessayer plus tard."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Vous devez être connecté pour récupérer vos informations."
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observateurs"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Vous êtes déjà dans le salon %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr ""
 "Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
@@ -4302,13 +4738,13 @@ msgstr ""
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "en utilisant le compte %s"
@@ -4316,41 +4752,53 @@ msgstr "en utilisant le compte %s"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "en utilisant le compte %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "du compte %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Gérer les Marque-pages..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "Re_joindre un nouveau salon"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Rejoindre un salon de discussion"
+
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Vous avez des messages non-lus"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Lisez tous les évènements avant de supprimer ce compte."
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4358,67 +4806,86 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "La passerelle \"%s\" sera enlevée"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Vous ne pourrez plus envoyer et recevoir de messages aux contacts de cette "
+"passerelle."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez une clé à assigner au contact"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Nouveau Salon"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Re_nommer"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Connecter"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "_Déconnecter"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, 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:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4426,7 +4893,7 @@ msgstr ""
 "En supprimant ce contact, vous enlevez aussi son autorisation. Il/Elle vous "
 "verra donc toujours déconnecté."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4434,36 +4901,51 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il vous "
 "verra donc toujours déconnecté."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Le contact \"%s\" sera enlevé de la liste de contacts"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"En supprimant ce contact, vous enlevez aussi son autorisation. Il/Elle vous "
+"verra donc toujours déconnecté."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, 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:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "mot de passe erroné"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Ressaisissez votre mot de passe GPG ou pressez Annuler."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4471,20 +4953,21 @@ msgstr ""
 "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
 "vous sûr de vouloir être invisible ?"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 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:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Vous avez des messages non-lus"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4492,145 +4975,111 @@ msgstr ""
 "Les messages seront disponibles à une lecture ultérieure si l'archivage de "
 "l'historique est actif."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Mettre %s dans le groupe %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "associer %s et %s en un contact groupé ?"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Changer le message d'état..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Cacher ce menu"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d message non-lu"
-msgstr[1] "Gajim - %d messages non-lus"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d message non-lu"
-msgstr[1] "Gajim - %d messages non-lus"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d message simple non-lu"
-msgstr[1] "Gajim - %d messages simples non-lus"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d message de salon non-lu"
-msgstr[1] "Gajim - %d messages de salon non-lus"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d message privé non-lu"
-msgstr[1] "Gajim - %d messages privés non-lus"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Fonction : "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Affiliation : "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Ressource : "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "État : "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Inscription : "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "État : "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Dernière connexion le %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Depuis %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "depuis %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Identifiant Jabber :"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Télécharger"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Type : "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Non commencé"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Terminé"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Calé"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "En train de transférer"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Ce service n'a pas encore renvoyé d'informations détaillées"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4638,32 +5087,32 @@ msgstr ""
 "Ce service n'a pas renvoyé d'informations détaillées.\n"
 "Il est probablement défectueux ou cassé"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Impossible de charger l'image"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "depuis %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Affiliation : "
+
+#: ../src/vcard.py:265
 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:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4671,12 +5120,12 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
 "votre"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 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:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4684,28 +5133,16 @@ msgstr ""
 "Vous n'êtes pas intéressé par l'état de ce contact et il ne s'intéressepas "
 "au votre"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 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:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
-#: ../src/vcard.py:458
-msgid "Without a connection you can not publish your contact information."
-msgstr "Vous devez être connecté pour publier vos informations."
-
-#: ../src/vcard.py:491
-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:495
-msgid "Personal details"
-msgstr "Informations Personnelles"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "création de la base de donnée de l'historique"
 
@@ -4730,93 +5167,89 @@ msgstr "%s est un répertoire mais devrait être un fichier"
 msgid "creating %s directory"
 msgstr "crée le répertoire %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (ou python-pysqlite2) n'est pas installé.Quitte..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Service indisponible : Gajim n'est pas lancé ou remote_control est False"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus n'est pas présent sur cette machine"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Le bus de session n'est pas disponible.\n"
-"Essayer en lisant http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Utilise DBus et Notification-Daemon pour afficher les notifications"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Temps en minutes, au bout duquel votre état basculera absent."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Absent car inactif"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Temps en minutes après lequel votre état basculera non disponible."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Non disponible car inactif"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 "Traiter les paires de * / _ comme des éventuels caractères de formatage."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Si vrai ne supprime pas */_ . Donc *abc* sera en gras mais sans supprimer "
 "les * *"
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4824,12 +5257,12 @@ msgstr ""
 "Nombre de lignes de l'historique à afficher lorsque l'onglet ou la fenêtre "
 "de discussion est ouvert à nouveau."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Durée de vie en minutes des dernières lignes des conversations précédentes."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4837,13 +5270,13 @@ msgstr ""
 "Envoyer le message avec Ctrl+Entrée et aller à la ligne avec Entrée "
 "(comportement par défaut du client ICQ de Mirabilis)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr ""
 "Nombre de lignes à stocker pour le rappel des lignes précédentes (avec Ctrl"
 "+flèche vers le haut)."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4852,24 +5285,24 @@ msgstr ""
 "Soit une url personnalisée contenant %s où %s est le mot/la phrase, soit "
 "\"WIKTIONARY\", ce qui signifie l'utilisation de wikitionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si cette case est cochée, Gajim pourra être contrôlé à distance via gajim-"
 "remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Demander avant de fermer un onglet ou une fenêtre de discussion de salon."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4877,7 +5310,7 @@ msgstr ""
 "Toujours demander avant de fermer les salons de cette liste séparés par des "
 "espaces."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4885,7 +5318,7 @@ msgstr ""
 "Ne jamais demander avant de fermer les salons de cette liste séparés par des "
 "espaces."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4893,24 +5326,24 @@ msgstr ""
 "Outrepasse le nom d'hôte pour les transferts de fichier en cas de traduction "
 "d'adresse/transfert de port."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "D'après le standard IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Afficher le bouton fermer sur l'onglet ?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4918,7 +5351,7 @@ msgstr ""
 "Une liste de mots séparés par des points-virgules qui seront mis en "
 "surbrillance dans les salons."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4927,11 +5360,11 @@ msgstr ""
 "fenêtre. Cette option n'est prise en compte que si l'icône dans la barre de "
 "notification est utilisée."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Si vrai, Gajim s'enregistre pour xmpp:// à chaque démarrage."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4939,15 +5372,16 @@ msgstr ""
 "Si vrai, Gajim affichera dans chaque onglet une icône contenant les messages "
 "non-lus. En fonction du thème, cette icône peut être animée."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Si vrai, Gajim affichera le message d'état, s'il n'est pas vide, sous le nom "
 "de chaque contact dans la fenêtre principale."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4955,7 +5389,7 @@ msgstr ""
 "Si vrai demandera son avatar à chaque contact qui n'en avait pas la fois "
 "précédente ou dont la version en cache a expiré."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4964,20 +5398,29 @@ msgstr ""
 "Si faux, vous ne verrez plus les lignes d'état dans les conversations quand "
 "un contact modifie son état et/ou son message d'état."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4987,17 +5430,19 @@ msgstr ""
 "clignoter (comportement par défaut dans la plupart des gestionnaires de "
 "fenêtres) la fenêtre quand elle contient des évènements non lus."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 n'aime pas l'information sha quand on rejoint un salon protégé "
 "par un mot de passe. Passer cette option a Faux pour ne plus envoyer "
 "l'information sha dans les présences des salons"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5005,7 +5450,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Contrôle la fenêtre dans laquelle sont placés les nouvelles conversassions.\n"
 "'always' - Toutes les conversassions dans une unique fenêtre.\n"
@@ -5015,55 +5460,70 @@ msgstr ""
 "'pertype' - Toutes les conversassions d'un même type (discussion, salon) "
 "dans la même fenêtre."
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Si Faux, vous ne verrez plus les avatars dans les fenêtres de discussions"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Si vrai, appuyer sur la touche echap pour fermer un onglet/une fenêtre"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Cacher les boutons dans la fenêtre des salons"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Cache les boutons dans les fenêtres de discussions"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Cacher les boutons dans la fenêtre de discussion"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Cache la bannière dans les fenêtres de discussions"
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr ""
 "Cache la liste des occupants du salon dans les fenêtres des salons de "
 "discussion"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Contournement de bug de jabberd2"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5071,59 +5531,106 @@ msgstr ""
 "Si cette case est cochée, Gajim utilisera votre IP et les proxies définis "
 "dans l'option file_transfer_proxies pour les transferts de fichiers."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Dors"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Travail"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Je suis dehors à profiter de la vie"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Disponible"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Disponible pour discuter"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Non disponible"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5131,7 +5638,7 @@ msgstr ""
 "Son à jouer lorsqu'un message de salon contient un des mots de "
 "muc_highlight_words, ou lorsqu'un message de salon contient votre surnom."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5139,98 +5646,213 @@ msgstr ""
 "Son à jouer lorsqu'un message quelconque de salon arrive. (Ce réglage est "
 "pris en compte seulement si notify_on_all_muc_messages est vrai)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "Vert"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "épicerie"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "Humain"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "mot de passe erroné"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+"L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
+"temps"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Surnom introuvable : %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Un mot de passe est requis pour rejoindre ce salon."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Vous êtes banni de ce salon."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Ce salon n'existe pas."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "La création de salon est réservée aux administrateurs."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Vous n'êtes pas dans la liste des membres."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Le surnom que vous vouliez utiliser est actuellement utilisé ou enregistré "
+"par un autre occupant.\n"
+"Veuillez entrer un autre surnom ci-dessous :"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "nous sommes maintenant inscrits chez %s"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Requête de désinscription de la part de %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "nous ne sommes plus dans la liste de %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"je Jid %s ne respecte pas la norma RFC. Il ne sera pas ajouté a votre liste "
+"de contact. Utiliser un outil de gestion de liste de contact tel que http://"
+"jru.jabberstudio.org/ pour le supprimer"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Pour continuer à envoyer et recevoir des messages, vous devez vous "
 "reconnecter."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Le transport %s a mal répondu a la requête "
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Réponse non valide"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Connecté au serveur %s:%s avec %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Vérifiez si votre identifiant et votre mot de passe sont corrects."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "Mot de passe OpenPGP non renseigné"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vous serez connecté à %s sans OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "invisible"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "Déconnecté"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Je suis %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[ce message est chiffré]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5239,299 +5861,556 @@ msgstr ""
 "Sujet : %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
+# Traduction moins mauvaise mais pas terrible: binding=lier, attacher
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "La passerelle python - D-Bus n'est pas installée sur cet ordinateur"
+
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Les possibilités D-Bus de Gajim ne peuvent pas être utilisées"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2 (ou python-pysqlite2) n'est pas installé.Quitte..."
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Service indisponible : Gajim n'est pas lancé ou remote_control est False"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus n'est pas présent sur cette machine"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Le bus de session n'est pas disponible.\n"
+"Essayer en lisant http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Impossible de rejoindre le salon"
+msgid "one"
+msgstr "Aucun"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "qui"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Rue :"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Port : "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "fichier"
 
-#: ../src/common/connection_handlers.py:581
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Événement"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Continuer"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Supprimer"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "Registration information for transport %s has not arrived in time"
+msgid "%0 o'clock"
 msgstr ""
-"L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
-"temps"
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Impossible de rejoindre le salon"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Un mot de passe est requis pour rejoindre ce salon."
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Vous êtes banni de ce salon."
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Ce salon n'existe pas."
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "La création de salon est réservée aux administrateurs."
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Vous n'êtes pas dans la liste des membres."
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
 msgstr ""
-"Le surnom que vous vouliez utiliser est actuellement utilisé ou enregistré "
-"par un autre occupant.\n"
-"Veuillez entrer un autre surnom ci-dessous :"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "nous sommes maintenant inscrits chez %s"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Requête de désinscription de la part de %s"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "S'enregistrer à %s"
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "nous ne sommes plus dans la liste de %s"
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
 msgstr ""
-"je Jid %s ne respecte pas la norma RFC. Il ne sera pas ajouté a votre liste "
-"de contact. Utiliser un outil de gestion de liste de contact tel que http://"
-"jru.jabberstudio.org/ pour le supprimer"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Travail"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Aucun"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Événement"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Caractère non valide dans le nom d'utilisateur."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Adresse du serveur requise."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Caractère non valide dans le nom d'hôte."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Caractère non valide dans la ressource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s Go"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mo"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s Kio"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "O_ccupé"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Non disponible"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Disponible"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Disponible"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Connexion"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "_Absent"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Absent"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "Déc_onnecté"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "Inconnu"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "en erreur"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "À"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Les deux"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "Aucun"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Modérateurs"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Visiteurs"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Aucun"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "Pr_opriétaire"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrateur"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Membre"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "écrit un message..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d message non-lu"
+msgstr[1] "Gajim - %d messages non-lus"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d message simple non-lu"
+msgstr[1] "Gajim - %d messages simples non-lus"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d message de salon non-lu"
+msgstr[1] "Gajim - %d messages de salon non-lus"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d message privé non-lu"
+msgstr[1] "Gajim - %d messages privés non-lus"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erreur: impossible d'ouvrir %s en lecture"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "cyan"
+
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "création de la base de donnée de l'historique"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "du compte %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Impossible de charger l'image"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Impossible de se connecter à \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[ce message est chiffré]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Ajouter"
+
+#~ msgid "Add"
+#~ msgstr "Ajouter"
+
+#~ msgid "Away "
+#~ msgstr "Absent "
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Télécharger"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Ajout de notifications spéciales pour %s"
+
+#~ msgid "Not Available "
+#~ msgstr "Non disponible "
+
+#~ msgid "Up"
+#~ msgstr "Haut"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Supprimer"
+
+#~ msgid "Contact _Info"
+#~ msgstr "_Informations"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informations"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "nom de salon ou de serveur non-valide"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Version de dbus inconnue : %s"
+
+#~ msgid "vCard publication succeeded"
+#~ 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."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Migration de l'historique..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Merci de patienter pendant la migration de l'historique..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "Re_joindre un nouveau salon"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Cacher ce menu"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d message non-lu"
+#~ msgstr[1] "Gajim - %d messages non-lus"
+
+#~ msgid "Since %s"
+#~ msgstr "Depuis %s"
diff --git a/po/gajim.pot b/po/gajim.pot
index 6429685ee..4b192099c 100644
--- a/po/gajim.pot
+++ b/po/gajim.pot
@@ -3,30 +3,30 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr ""
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr ""
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr ""
 
@@ -43,16 +43,22 @@ msgid "_Discover Services..."
 msgstr ""
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr ""
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr ""
 
 #: ../data/glade/account_context_menu.glade.h:6
+msgid "_Open Gmail Inbox"
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr ""
 
@@ -102,7 +108,7 @@ msgid "Pass_word:"
 msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr ""
 
@@ -125,7 +131,7 @@ msgid "Your JID:"
 msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr ""
 
@@ -139,7 +145,7 @@ msgid "_Host:"
 msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr ""
 
@@ -171,10 +177,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr ""
 
@@ -191,6 +199,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr ""
 
@@ -207,6 +216,7 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr ""
 
@@ -223,16 +233,16 @@ msgid "Edit Personal Information..."
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr ""
 
@@ -253,18 +263,21 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -279,18 +292,23 @@ msgstr ""
 msgid "Manage..."
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr ""
 
@@ -310,14 +328,18 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:32
-msgid "Proxy:"
+msgid "Priority will change automatically according to your status."
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:33
-msgid "Resour_ce: "
+msgid "Proxy:"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:34
+msgid "Resour_ce: "
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -326,40 +348,46 @@ msgid ""
 "has the highest priority will get the events. (see below)"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr ""
 
@@ -369,56 +397,83 @@ msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+msgid "Mer_ge accounts"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
-msgid "A_llow this contact to view my status"
+msgid "A_ccount:"
 msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:2
-msgid "Add New Contact"
+msgid "A_llow this contact to view my status"
 msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:3
-msgid "I would like to add you to my contact list."
+msgid "Add New Contact"
 msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:4
-msgid "_Account:"
+msgid "I would like to add you to my contact list."
 msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 msgid "_Group:"
 msgstr ""
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 msgid "_Nickname:"
 msgstr ""
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 msgid "_Protocol:"
 msgstr ""
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
+#: ../data/glade/add_new_contact_window.glade.h:14
+msgid "_Register"
 msgstr ""
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 msgid "_User ID:"
 msgstr ""
 
@@ -504,71 +559,57 @@ msgid "<b>Sounds</b>"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
-msgid "Add"
+msgid "Advanced Actions"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:6
-msgid "Advanced Actions"
+msgid "Advanced Notifications Control"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
-msgid "Advanced Notifications Control"
+msgid "All Status "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-msgid "All Status "
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
+msgid "Busy "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:10
-msgid "Away "
+msgid "Don't have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:11
-msgid "Busy "
+msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-msgid "Don't have "
+#: ../src/common/helpers.py:242
+msgid "Invisible"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:13
-msgid "Down"
+msgid "Launch a command"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-msgid "Have "
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
-msgid "Invisible"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:16
-msgid "Launch a command"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:17
-msgid "List of special notifications settings"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid "Not Available "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:19
 msgid "Online / Free For Chat"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 msgid "Play a sound"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -581,70 +622,70 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable auto opening chat window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Open chat window with user"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "_Show event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "for "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -679,7 +720,7 @@ msgstr ""
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr ""
 
@@ -700,7 +741,8 @@ msgid "_Open Link in Browser"
 msgstr ""
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr ""
@@ -710,7 +752,8 @@ msgid "Click to see past conversations with this contact"
 msgstr ""
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr ""
 
@@ -726,7 +769,8 @@ msgstr ""
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr ""
 
@@ -788,7 +832,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr ""
 
@@ -821,63 +865,58 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr ""
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr ""
 
@@ -989,7 +1028,7 @@ msgid "Accept"
 msgstr ""
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr ""
 
@@ -997,13 +1036,14 @@ msgstr ""
 msgid "Invitation Received"
 msgstr ""
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr ""
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr ""
 
@@ -1021,13 +1061,8 @@ msgstr ""
 msgid "Room:"
 msgstr ""
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr ""
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr ""
 
@@ -1051,6 +1086,10 @@ msgstr ""
 msgid "Print status:"
 msgstr ""
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr ""
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr ""
@@ -1072,7 +1111,8 @@ msgid "Manage Proxy Profiles"
 msgstr ""
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr ""
 
@@ -1088,20 +1128,21 @@ msgstr ""
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr ""
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr ""
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr ""
 
@@ -1170,18 +1211,25 @@ msgid "Also known as iChat style"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:20
-msgid "Ask status message when I:"
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:21
-msgid "Auto _away after:"
+msgid "Ask status message when I:"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _not available after:"
+msgid "Auto _away after:"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:23
+msgid "Auto _not available after:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1189,124 +1237,134 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
 "not in the roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+msgid "Default Status Messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
 "send to the other party."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
 "etc...)"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1314,79 +1372,83 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1394,143 +1456,151 @@ msgid ""
 "you are not already chatting with"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "_Advanced Notifications Control..."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+msgid "Privacy Lists:"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 msgid "<b>List of rules</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
-msgid "All"
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
-msgid "Allow"
+#: ../data/glade/privacy_list_window.glade.h:5
+msgid "Active on each startup"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-msgid "Default"
+#: ../data/glade/privacy_list_window.glade.h:7
+msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "Order:"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 msgid "Privacy List"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 msgid "all by subscription"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all in the group"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1538,28 +1608,166 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 msgid "to send me messages"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me status"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to view my status"
 msgstr ""
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:4
+msgid "Avatar:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr ""
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr ""
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr ""
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr ""
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "Personal Info"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr ""
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
 msgstr ""
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr ""
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr ""
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
 msgstr ""
 
 #: ../data/glade/remove_account_window.glade.h:1
@@ -1579,45 +1787,56 @@ msgid "A_sk to see his/her status"
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Allow him/her to see my status"
 msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "_Forbid him/her to see my status"
 msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr ""
 
@@ -1642,42 +1861,50 @@ msgid "Help online"
 msgstr ""
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+msgid "Profile, A_vatar"
 msgstr ""
 
 #: ../data/glade/roster_window.glade.h:8
+msgid "Show Trans_ports"
+msgstr ""
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr ""
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr ""
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr ""
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr ""
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr ""
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr ""
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr ""
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr ""
 
+#: ../data/glade/roster_window.glade.h:21
+msgid "_View"
+msgstr ""
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr ""
@@ -1747,22 +1974,18 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr ""
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr ""
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr ""
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr ""
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr ""
 
@@ -1778,219 +2001,230 @@ msgstr ""
 msgid "Sta_tus"
 msgstr ""
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
+msgid "Ask:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
+#: ../data/glade/vcard_information_window.glade.h:8
+msgid "Client:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:4
-msgid "Ask:"
+#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/zeroconf_information_window.glade.h:1
+msgid "Contact"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
+#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+msgid "Jabber ID:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
+#: ../data/glade/vcard_information_window.glade.h:28
+msgid "OS:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "Client:"
+#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
+#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:41
+msgid "Subscription:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
+#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
+#: ../data/glade/xml_console_window.glade.h:1
+msgid "<b>Jabber Traffic</b>"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
+#: ../data/glade/xml_console_window.glade.h:2
+msgid "<b>XML Input</b>"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
 msgstr ""
 
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
+#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
+#: ../data/glade/xml_console_window.glade.h:6
+msgid "Info/Query"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
+#. 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))
+#: ../data/glade/xml_console_window.glade.h:8
+msgid "_IQ"
 msgstr ""
 
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
+#: ../data/glade/xml_console_window.glade.h:9
+msgid "_Message"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
+#: ../data/glade/xml_console_window.glade.h:10
+msgid "_Presence"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Jabber ID:"
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
 msgstr ""
 
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
+#: ../data/glade/zeroconf_information_window.glade.h:7
+msgid "Personal"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "OS:"
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+msgid "Modify Account"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
+#: ../src/advanced.py:57
+msgid "Preference Name"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
+#: ../src/advanced.py:63
+msgid "Value"
 msgstr ""
 
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
+#: ../src/advanced.py:72
+msgid "Type"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:35
-msgid "Resource:"
+#. we talk about option description in advanced configuration editor
+#: ../src/advanced.py:128
+msgid "(None)"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
+#. we talk about password
+#: ../src/advanced.py:227
+msgid "Hidden"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "Status:"
+#: ../src/chat_control.py:52
+msgid "Briton"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
+#: ../src/chat_control.py:52
+msgid "Czech"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Subscription:"
+#: ../src/chat_control.py:52
+msgid "German"
 msgstr ""
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
+#: ../src/chat_control.py:52
+msgid "Greek"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
+#: ../src/chat_control.py:52
+msgid "Esperanto"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "_Log conversation history"
+#: ../src/chat_control.py:52
+msgid "Spanish"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
+#: ../src/chat_control.py:52
+msgid "Basc"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
+#: ../src/chat_control.py:52
+msgid "French"
 msgstr ""
 
-#: ../data/glade/xml_console_window.glade.h:1
-msgid "<b>Jabber Traffic</b>"
+#: ../src/chat_control.py:52
+msgid "Croatian"
 msgstr ""
 
-#: ../data/glade/xml_console_window.glade.h:2
-msgid "<b>XML Input</b>"
+#: ../src/chat_control.py:52
+msgid "Italian"
 msgstr ""
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
 msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
-msgid "Info/Query"
+#: ../src/chat_control.py:52
+msgid "Dutch"
 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))
-#: ../data/glade/xml_console_window.glade.h:8
-msgid "_IQ"
+#: ../src/chat_control.py:52
+msgid "Norvegian"
 msgstr ""
 
-#: ../data/glade/xml_console_window.glade.h:9
-msgid "_Message"
+#: ../src/chat_control.py:52
+msgid "Polish"
 msgstr ""
 
-#: ../data/glade/xml_console_window.glade.h:10
-msgid "_Presence"
+#: ../src/chat_control.py:52
+msgid "Portuguese"
 msgstr ""
 
-#: ../src/advanced.py:65
-msgid "Preference Name"
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/advanced.py:71
-msgid "Value"
+#: ../src/chat_control.py:52
+msgid "Russian"
 msgstr ""
 
-#: ../src/advanced.py:80
-msgid "Type"
+#: ../src/chat_control.py:52
+msgid "Slovak"
 msgstr ""
 
-#. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
-msgid "(None)"
+#: ../src/chat_control.py:52
+msgid "Swedish"
 msgstr ""
 
-#. we talk about password
-#: ../src/advanced.py:235
-msgid "Hidden"
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
 msgstr ""
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2000,310 +2234,363 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr ""
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr ""
 
+#: ../src/chat_control.py:1022
+#, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr ""
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr ""
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr ""
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr ""
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr ""
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr ""
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, python-format
+msgid "Dictionary for lang %s not available"
+msgstr ""
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr ""
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr ""
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr ""
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr ""
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr ""
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr ""
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr ""
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr ""
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr ""
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr ""
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr ""
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr ""
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr ""
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr ""
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr ""
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr ""
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr ""
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr ""
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+msgid "Your server can't save your personal information."
+msgstr ""
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr ""
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr ""
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr ""
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr ""
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr ""
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr ""
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+msgid "Account Local already exists."
+msgstr ""
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr ""
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr ""
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr ""
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr ""
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr ""
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr ""
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr ""
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr ""
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr ""
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2313,605 +2600,655 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr ""
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr ""
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr ""
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr ""
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr ""
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
+#: ../src/config.py:2636
+msgid "New Group Chat"
 msgstr ""
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr ""
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr ""
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr ""
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr ""
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr ""
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr ""
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr ""
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr ""
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr ""
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
 msgstr ""
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr ""
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr ""
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr ""
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 msgstr ""
 
-#: ../src/conversation_textview.py:263
+#: ../src/conversation_textview.py:342
 #, python-format
-msgid "Actions for \"%s\""
+msgid "_Actions for \"%s\""
 msgstr ""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr ""
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr ""
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr ""
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr ""
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr ""
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr ""
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr ""
-
-#: ../src/dialogs.py:55
+#: ../src/dialogs.py:58
 #, python-format
-msgid "Contact's name: <i>%s</i>"
+msgid "Contact name: <i>%s</i>"
 msgstr ""
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr ""
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr ""
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr ""
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr ""
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr ""
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr ""
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr ""
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr ""
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr ""
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+msgid "AIM Address:"
+msgstr ""
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+msgid "MSN Address:"
+msgstr ""
+
+#: ../src/dialogs.py:419
+msgid "Yahoo! Address:"
+msgstr ""
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr ""
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr ""
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr ""
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr ""
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr ""
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+msgid "User ID:"
+msgstr ""
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr ""
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr ""
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr ""
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr ""
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr ""
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr ""
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
+#: ../src/dialogs.py:1184
+msgid "Invalid room Jabber ID"
 msgstr ""
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+msgid "The room Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr ""
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr ""
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr ""
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 msgid "Invalid JID"
 msgstr ""
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr ""
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr ""
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr ""
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr ""
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr ""
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr ""
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr ""
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr ""
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr ""
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr ""
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr ""
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr ""
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr ""
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 msgid "Contact Changed Status"
 msgstr ""
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
+#: ../src/dialogs.py:1521
+#, python-format
+msgid "Single Message using account %s"
+msgstr ""
+
+#: ../src/dialogs.py:1523
 #, python-format
-msgid "Single Message with account %s"
+msgid "Single Message in account %s"
 msgstr ""
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr ""
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr ""
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr ""
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr ""
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, python-format
+msgid "Order: %s, action: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1878
 msgid "<b>Edit a rule</b>"
 msgstr ""
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 msgid "<b>Add a rule</b>"
 msgstr ""
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 msgid "Privacy Lists"
 msgstr ""
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr ""
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr ""
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr ""
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr ""
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr ""
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr ""
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr ""
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 msgid "Condition"
 msgstr ""
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr ""
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr ""
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr ""
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr ""
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr ""
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr ""
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr ""
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr ""
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr ""
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr ""
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr ""
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr ""
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr ""
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr ""
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr ""
@@ -2929,7 +3266,7 @@ msgstr ""
 msgid "Filename: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr ""
@@ -2937,17 +3274,17 @@ msgstr ""
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr ""
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr ""
 
@@ -2968,78 +3305,88 @@ msgstr ""
 msgid "Connection with peer cannot be established."
 msgstr ""
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, python-format
+msgid "Recipient: %s"
+msgstr ""
+
+#: ../src/filetransfers_window.py:226
+#, python-format
+msgid "Error message: %s"
+msgstr ""
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr ""
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr ""
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr ""
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr ""
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr ""
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
@@ -3047,630 +3394,642 @@ msgstr ""
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr ""
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr ""
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr ""
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr ""
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr ""
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr ""
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr ""
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr ""
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr ""
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr ""
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr ""
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr ""
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr ""
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr ""
+
+#: ../src/gajim.py:77
+msgid "Gajim needs pywin32 to run"
+msgstr ""
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr ""
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr ""
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+msgid "Connection Failed"
+msgstr ""
+
+#: ../src/gajim.py:609
+#, python-format
+msgid "Subject: %s"
+msgstr ""
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr ""
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr ""
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr ""
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr ""
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr ""
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr ""
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr ""
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr ""
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr ""
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr ""
+
+#: ../src/gajim.py:1084
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1086
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] ""
+msgstr[1] ""
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr ""
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr ""
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr ""
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr ""
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr ""
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+msgid "Please type a new username for your local account"
+msgstr ""
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr ""
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+
+#: ../src/gajim-remote.py:66
+msgid "Shows a help on specific command"
 msgstr ""
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr ""
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr ""
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr ""
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr ""
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr ""
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr ""
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr ""
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr ""
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr ""
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr ""
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr ""
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 msgstr ""
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr ""
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr ""
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr ""
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 msgstr ""
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 msgid "subject"
 msgstr ""
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 msgid "message subject"
 msgstr ""
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr ""
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr ""
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr ""
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr ""
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr ""
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr ""
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr ""
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr ""
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr ""
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr ""
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr ""
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr ""
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr ""
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr ""
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 msgid "Adds new contact to this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr ""
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 msgid "Starts chat, using this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+msgid "XML to send"
+msgstr ""
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr ""
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr ""
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
 "\t %s"
 msgstr ""
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr ""
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr ""
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 msgstr ""
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr ""
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr ""
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr ""
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr ""
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr ""
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr ""
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr ""
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr ""
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr ""
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr ""
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr ""
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr ""
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr ""
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr ""
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr ""
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr ""
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr ""
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr ""
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr ""
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr ""
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr ""
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr ""
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr ""
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr ""
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr ""
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr ""
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr ""
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr ""
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr ""
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr ""
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr ""
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr ""
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr ""
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr ""
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr ""
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr ""
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 msgid "Insert Nickname"
 msgstr ""
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr ""
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr ""
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr ""
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr ""
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr ""
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr ""
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3679,44 +4038,44 @@ msgid ""
 "spaces in nickname."
 msgstr ""
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr ""
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr ""
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr ""
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
 "providing a reason."
 msgstr ""
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr ""
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3724,198 +4083,198 @@ msgid ""
 "nickname."
 msgstr ""
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
 "g. /%s explodes.)"
 msgstr ""
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
 "message to the occupant specified by nickname."
 msgstr ""
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr ""
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr ""
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr ""
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr ""
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr ""
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr ""
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr ""
 
-#: ../src/groupchat_control.py:1380
+#: ../src/groupchat_control.py:1386
 #, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr ""
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr ""
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr ""
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr ""
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr ""
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr ""
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 msgid "Save Image as..."
 msgstr ""
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr ""
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr ""
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr ""
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr ""
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr ""
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr ""
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3924,131 +4283,170 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr ""
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr ""
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr ""
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr ""
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr ""
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr ""
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr ""
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr ""
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr ""
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr ""
 
-#: ../src/notify.py:150
+#: ../src/notify.py:234
 #, python-format
-msgid "New Private Message from room %s"
+msgid "New Private Message from group chat %s"
 msgstr ""
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: ../src/roster_window.py:131
-msgid "Merged accounts"
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
-msgid "Observers"
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
 msgstr ""
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr ""
+
+#: ../src/profile_window.py:245
+msgid "Information received"
+msgstr ""
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr ""
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
 msgstr ""
 
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr ""
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr ""
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
+msgid "Merged accounts"
+msgstr ""
+
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+msgid "Observers"
+msgstr ""
+
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr ""
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr ""
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr ""
@@ -4056,377 +4454,366 @@ msgstr ""
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr ""
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr ""
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+msgid "_Manage Bookmarks..."
 msgstr ""
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr ""
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr ""
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
+#: ../src/roster_window.py:960
+msgid "_Join New Group Chat"
 msgstr ""
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr ""
+
+#: ../src/roster_window.py:1259
+msgid "You must read them before removing this transport."
+msgstr ""
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr ""
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+msgid "Transports will be removed"
+msgstr ""
+
+#: ../src/roster_window.py:1270
+#, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr ""
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr ""
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+msgid "_New room"
+msgstr ""
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr ""
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr ""
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr ""
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr ""
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr ""
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 
-#: ../src/roster_window.py:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr ""
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 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:1831
+#: ../src/roster_window.py:2334
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+msgid "Contacts will be removed from your roster"
+msgstr ""
+
+#: ../src/roster_window.py:2342
+#, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr ""
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr ""
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr ""
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr ""
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 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:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr ""
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: ../src/roster_window.py:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr ""
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr ""
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr ""
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr ""
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr ""
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr ""
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/tooltips.py:326
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/tooltips.py:332
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/tooltips.py:338
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/tooltips.py:344
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr ""
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr ""
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr ""
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
 msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr ""
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr ""
 
-#: ../src/tooltips.py:570
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr ""
+
+#: ../src/tooltips.py:484
 #, python-format
-msgid "Last status on %s"
+msgid "Last status: %s"
 msgstr ""
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:486
 #, python-format
-msgid "Since %s"
+msgid " since %s"
 msgstr ""
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+msgid "Jabber ID: "
+msgstr ""
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr ""
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr ""
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr ""
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr ""
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr ""
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr ""
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr ""
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 msgstr ""
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr ""
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr ""
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+msgid "Affiliation:"
+msgstr ""
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. None
-#: ../src/vcard.py:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr ""
 
-#: ../src/vcard.py:458
-msgid "Without a connection you can not publish your contact information."
-msgstr ""
-
-#: ../src/vcard.py:491
-msgid "Without a connection, you can not get your contact information."
-msgstr ""
-
-#: ../src/vcard.py:495
-msgid "Personal details"
-msgstr ""
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr ""
 
@@ -4451,229 +4838,236 @@ msgstr ""
 msgid "creating %s directory"
 msgstr ""
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr ""
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:88
+msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr ""
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr ""
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr ""
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr ""
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 msgstr ""
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr ""
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr ""
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 msgstr ""
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr ""
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 msgstr ""
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr ""
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 msgstr ""
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr ""
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4681,504 +5075,836 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+msgid "Hides the buttons in group chat window."
 msgstr ""
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+msgid "Hides the buttons in two persons chat window."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr ""
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+msgid "Hides the room occupants list in group chat window."
 msgstr ""
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+msgid "Is OpenPGP enabled for this contact?"
+msgstr ""
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr ""
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr ""
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr ""
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr ""
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr ""
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr ""
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr ""
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+msgid "I'm out enjoying life."
+msgstr ""
+
+#: ../src/common/config.py:352
+msgid "I'm available."
+msgstr ""
+
+#: ../src/common/config.py:353
+msgid "I'm free for chat."
+msgstr ""
+
+#: ../src/common/config.py:355
+msgid "I'm not available."
+msgstr ""
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr ""
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid "Wrong host"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1449
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr ""
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr ""
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr ""
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr ""
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr ""
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr ""
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr ""
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr ""
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr ""
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr ""
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr ""
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr ""
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr ""
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:49
-msgid "Unable to load idle module"
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr ""
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
 msgstr ""
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgid "%0 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
 msgstr ""
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "ten to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr ""
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr ""
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr ""
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr ""
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr ""
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr ""
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr ""
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr ""
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr ""
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr ""
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr ""
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr ""
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr ""
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr ""
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr ""
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr ""
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr ""
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr ""
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr ""
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr ""
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr ""
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr ""
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr ""
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr ""
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr ""
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr ""
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr ""
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr ""
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr ""
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr ""
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr ""
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr ""
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr ""
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr ""
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+msgid "?Group Chat Contact Affiliation:None"
+msgstr ""
+
+#: ../src/common/helpers.py:301
+msgid "Owner"
+msgstr ""
+
+#: ../src/common/helpers.py:303
+msgid "Administrator"
+msgstr ""
+
+#: ../src/common/helpers.py:305
+msgid "Member"
+msgstr ""
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr ""
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr ""
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr ""
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr ""
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr ""
 
+#: ../src/common/helpers.py:871
+#, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:877
+#, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:883
+#, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:889
+#, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr ""
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr ""
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr ""
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr ""
+
+#: ../src/common/optparser.py:316
+msgid "migrating logs database to indeces"
+msgstr ""
+
+#: ../src/common/passwords.py:61
+#, python-format
+msgid "Gajim account %s"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+msgid "Could not start local service"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr ""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr ""
diff --git a/po/it.po b/po/it.po
index 1441cea88..b4b4b91c9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,29 +5,29 @@
 # Mauro Brenna <malloblenne@gmail.com>, 2005.
 # Andrea Ratti <scimiot@yahoo.it>, 2005.
 # Matteo Dell'Amico <della@linux.it>, 2005, 2006.
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-04-28 14:06+0300\n"
 "Last-Translator: Matteo Dell'Amico <della@linux.it>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "Un client Jabber GTK+"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Messaggistica istantanea Gajim"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Client IM Jabber"
 
@@ -44,16 +44,23 @@ msgid "_Discover Services..."
 msgstr "_Ricerca servizi..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "Chat di _gruppo"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modifica account..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Apri composizione email"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stato"
 
@@ -107,7 +114,7 @@ msgid "Pass_word:"
 msgstr "Pass_word:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "_Memorizza password"
 
@@ -132,7 +139,7 @@ msgid "Your JID:"
 msgstr "Il tuo JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Avanzato"
 
@@ -146,7 +153,7 @@ msgid "_Host:"
 msgstr "_Host:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Password:"
 
@@ -178,10 +185,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Varie</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informazioni personali</b>"
 
@@ -198,6 +207,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Riconnettiti automaticamente quando si perde la connessione"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "_Connetti all'avvio di Gajim"
 
@@ -218,6 +228,7 @@ msgstr ""
 "disabilitata."
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Scegli _chiave..."
 
@@ -234,16 +245,16 @@ msgid "Edit Personal Information..."
 msgstr "Modifica informazioni personali..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Generale"
 
@@ -270,6 +281,7 @@ msgstr ""
 "timeout che provoca una disconnessione"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -278,6 +290,7 @@ msgstr ""
 "di lettura solo per l'utente che esegue il programma"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -286,6 +299,7 @@ msgstr ""
 "usando questo account."
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -302,18 +316,23 @@ msgstr "Informazioni su di te, archiviate sul server"
 msgid "Manage..."
 msgstr "Gestisci..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Nessuno"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
@@ -336,14 +355,18 @@ msgstr ""
 "account; il client con la maggiore priorità riceverà gli eventi."
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "_Risorsa: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -357,40 +380,46 @@ msgstr ""
 "contemporaneamente. La risorsa con la priorità maggiore riceverà gli eventi "
 "(vedi sotto)."
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Salva _passphrase (non sicuro)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Memorizza i _log delle conversazioni con tutti i contatti"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Invia pacchetti di keep-alive"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "_Sincronizza lo stato dell'account con lo stato globale"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Usa _SSL (legacy)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Usa hostname/port personalizzati"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Usa proxy per il trasferimento file"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Nome: "
 
@@ -400,62 +429,91 @@ msgstr "Account"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Se marcato e se sono presenti 2 o più account, Gajim mostrerà tutti i "
 "contatti come se ci fosse un unico account"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Unisci account"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Modifica"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Elimina"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Account:"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Permetti di vedere il mio stato"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Aggiungi nuovo contatto"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Vorrei aggiungerti alla mia lista contatti."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Account:"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Gruppo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 msgid "_Nickname:"
 msgstr "_Nickname:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protocollo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "A_bbonati"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "_Registra"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "ID utente:"
@@ -547,82 +605,63 @@ msgstr "<b>Suoni</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Indirizzo"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "Avanzato"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Editor di configurazione avanzata"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Stato: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Assente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Occupato"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Scarica"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "Comando inesistente: /%s"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Creazione notifica speciale per %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Non disponibile"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Libero per chat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Riproduci _suoni"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -635,75 +674,75 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Nasconde i pulsanti nella finestra di chat di gruppo"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Usa una sola finestra di chat con _schede"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Mostra solo nella lista _contatti"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Mostra solo nella lista _contatti"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Porta: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -738,7 +777,7 @@ msgstr "Entra in chat di _gruppo"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Aggiungi ai contatti"
 
@@ -759,7 +798,8 @@ msgid "_Open Link in Browser"
 msgstr "_Apri il collegamento nel browser"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Inizia chat"
@@ -769,7 +809,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Cliccare per vedere le conversazioni precedenti con questo contatto"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Invia _file"
 
@@ -785,7 +826,8 @@ msgstr "_Vista compatta    Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Cronologia"
 
@@ -851,7 +893,7 @@ msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Mostra una notifica popup quando un trasferimento file viene completato"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Continua"
 
@@ -888,39 +930,34 @@ msgstr ""
 "Banner"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Attivo"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Grassetto"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Scrivendo"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Stile carattere:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Personalizzazione temi di Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Andato via"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Inattivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Corsivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -928,7 +965,7 @@ msgstr ""
 "Messaggi\n"
 "MUC"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -936,19 +973,19 @@ msgstr ""
 "Messaggi diretti\n"
 "a MUC"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "In pausa"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "_Colore del testo:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "Carattere del _testo:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Sfondo:"
 
@@ -1069,7 +1106,7 @@ msgid "Accept"
 msgstr "Accetta"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Nega"
 
@@ -1077,13 +1114,14 @@ msgstr "Nega"
 msgid "Invitation Received"
 msgstr "Invito ricevuto"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Entrare in chat di gruppo"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Nickname:"
 
@@ -1101,13 +1139,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Entra"
 
@@ -1132,6 +1165,10 @@ msgstr "Gestisci segnalibri"
 msgid "Print status:"
 msgstr "Stampa ora:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Server:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Titolo:"
@@ -1153,7 +1190,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Gestisci profili proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1169,20 +1207,21 @@ msgstr "Usa autenticazione"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Cliccare per inserire un emoticon (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "Cifratura OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Azioni"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Invia"
 
@@ -1255,18 +1294,25 @@ msgid "Also known as iChat style"
 msgstr "Conosciuto anche come stile iChat"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Chiedi messaggio di stato per:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "_Assente automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "N_on disponibile automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1278,19 +1324,19 @@ msgstr ""
 "Usa sempre le applicazioni predefinite di KDE\n"
 "Personalizza"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "_Prima del nickname:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Chat"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Noti_fiche dello stato di chat"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1300,35 +1346,40 @@ msgstr ""
 "spamma o disturba. Attenzione, verranno bloccati tutti i messaggi ricevuti "
 "da chi non è membro della lista contatti."
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Messaggio di stato"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "_Icone stato predefinite:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostra i _messaggi di stato dei contatti nella lista"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "_Ogni 5 minuti"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Emoticon:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Eventi"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1338,14 +1389,14 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono inviare al corrispondente."
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Gajim mostrerà automaticamente i nuovi eventi evidenziando la finestra "
 "relativa"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1353,7 +1404,7 @@ msgstr ""
 "Gajim notificherà i nuovi eventi tramite popup nell'angolo in fondo a destra "
 "dello schermo"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1361,7 +1412,7 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si connette"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1369,12 +1420,18 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si disconnette"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim cambierà solamente l'icona del contatto fonte del nuovo evento"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1382,7 +1439,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1390,7 +1447,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà il messaggio di stato di ogni membro di lista "
 "contatti e chat di gruppo sotto il suo nome"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1398,7 +1455,7 @@ msgstr ""
 "Se marcato, Gajim manterrà le posizioni delle finestre di chat e della lista "
 "contatti sullo schermo la prossima volta che verrà eseguito"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1408,7 +1465,7 @@ msgstr ""
 "(es., un contatto MSN avrà l'icona MSN equivalente per gli stati online, "
 "assente, occupato, ecc...)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1416,11 +1473,11 @@ msgstr ""
 "Se marcato, Gajim sostituirà gli smiley ASCII come ':)' con gli equivalenti "
 "emoticon grafici animati o statici"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "_Gestisci..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1432,80 +1489,84 @@ msgstr ""
 "Per account\n"
 "Per tipo"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Notificare i contatti che eseguono:"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Notifica le nuove e-mail su _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "In _tutti i messaggi"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "Una finestra messaggi:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Riproduci _suoni"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Stampa ora:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "Salva _posizione e dimensione delle finestre di chat e lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Mostra solo nella lista _contatti"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Il messaggio di stato per l'assenza automatica"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Il messaggio di stato per il 'non disponibile' automatico"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Usa le icone dei _trasporti"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Usa _icona nell'area di notifica"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1517,151 +1578,160 @@ msgstr ""
 "ciò. Notare che gli eventi per i nuovi messaggi avverranno solo se si tratta "
 "di un nuovo messaggio da un contatto con cui non si sta già chattando"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Quando si riceve un nuovo evento"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Editor di configurazione avanzata"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "_Dopo l'ora:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "_Prima dell'ora:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "Gestore _file:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Carattere:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "Evidenzia _parole scorrette"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignora gli eventi da contatti non appartenenti alla lista"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "Messaggio in _arrivo:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Client mail:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Mai"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Notifica"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "Messaggio in _uscita:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Riproduttore:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Mostra"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "_Reimposta ai colori di default"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "_Ordina i contatti per stato"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minuti"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Chat private"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Formato di una linea</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "_Connetti all'avvio di Gajim"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Elimina"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "ID Jabber: "
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Lista utenti bloccati"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Abbonamento"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "Nel gruppo"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1669,32 +1739,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Invia messaggio"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Chiedi di poter vedere il suo stato"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Permetti di vedere il mio stato"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "A proposito"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Indirizzo"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Imposta _avatar"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Data di nascita:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Città:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Società:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Paese:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Dipartimento:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Indirizzo extra:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Cognome:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-GG"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Nome:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Secondo nome:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Ancora"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Informazioni personali"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefono:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Titolo:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Codice postale:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Prefisso:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Ruolo:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Regione:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Via:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Suffisso:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Lavoro"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Pubblica"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Recupera"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1714,47 +1924,58 @@ msgid "A_sk to see his/her status"
 msgstr "Chiedi di poter vedere il suo stato"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Crea _notifica speciale"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Assegna chiave Open_PGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Modifica _gruppi"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Invia _messaggio singolo"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Inizia _chat"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Permetti di vedere il mio stato"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Proibisci di vedere il mio stato"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Elimina dai contatti"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Abbonamento"
 
@@ -1779,42 +2000,53 @@ msgid "Help online"
 msgstr "Aiuto online"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Profilo, avatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Trasporti"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Ricerca servizi"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "A_iuto"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Preferenze"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Esci"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Voce"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Vai"
@@ -1884,24 +2116,20 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorizza il contatto affinché sappia quando sei connesso"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "_Informazioni contatto"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Nega l'autorizzazione al contatto; in questa maniera non saprà quando sei "
 "connesso"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Richiesta di abbonamento"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Autorizza"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Nega"
 
@@ -1917,164 +2145,51 @@ msgstr "Mostra lista _contatti"
 msgid "Sta_tus"
 msgstr "Sta_to"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "A proposito"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Indirizzo"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Chiedi:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Data di nascita:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Città:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Client:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Società:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Informazioni sul contatto"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Paese:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Dipartimento:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Indirizzo extra:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Cognome:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-GG"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Nome:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Homepage:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Contatti"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "ID Jabber: "
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Indirizzo"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Secondo nome:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Ancora"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Telefono:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Titolo:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Codice postale:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Prefisso:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Risorsa:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Ruolo:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Imposta _avatar"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Regione:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Via:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Abbonamento:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Suffisso:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Lavoro"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Memorizza cronologia conversazione"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Pubblica"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Recupera"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Traffico Jabber</b>"
@@ -2106,30 +2221,165 @@ msgstr "_Messaggio"
 msgid "_Presence"
 msgstr "_Presenza"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Nome:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Nome:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Informazioni personali"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Modifica account..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Usa hostname/port personalizzati"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Nome preferenza"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Valore"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Nessuna)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Nascosto"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Generale"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "verde"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Indirizzo"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Corsivo"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Pubblica"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2145,53 +2395,63 @@ msgstr ""
 "\n"
 "Non verrà usata la caratteristica di evidenziatura parole scorrette"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Il messaggio non può venire inviato finché non si è connessi."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Chat"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s: %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s non ha annunciato una chiave OpenPGP e non gliene è stata assegnata una"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Cifratura attivata"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Cifratura disattivata"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "Non nei contatti"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2199,229 +2459,276 @@ msgstr ""
 "Se questa scheda viene chiusa e la cronologia è disabilitata, questo "
 "messaggio verrà perso."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Ogni %s _minuti"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Attivo"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Nessuna connessione disponibile"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Primo messaggio ricevuto"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Contatto connesso"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Messaggio inviato"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Evidenziatura messaggi in chat di gruppo"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in chat di gruppo"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Eventi non letti"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Per cambiare nome account, è necessario leggere tutti gli eventi pendenti."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Questo nome è già usato da un altro account. Scegliere un altro nome."
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Torno subito."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Effettuare un nuovo login?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Se si vogliono applicare subito i cambiamenti, è necessario effettuare un "
 "nuovo login."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "È necessario creare un nuovo account prima di poter modificare le "
 "informazioni personali."
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr ""
+"È necessario creare un nuovo account prima di poter modificare le "
+"informazioni personali."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Scelta chiave OpenPGP"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Non ci sono account attivi"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Nome account già in uso"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2429,11 +2736,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2441,11 +2748,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2453,11 +2760,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2465,7 +2772,7 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2482,89 +2789,90 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nuova stanza"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Chat di gruppo"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Controllare di avere compilato i campi server e stanza, o eliminare questo "
 "segnalibro."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "È necessario inserire una password per il nuovo account."
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID duplicato"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Questo account è già configurato in Gajim."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2573,23 +2881,23 @@ msgstr ""
 "\", o farlo più tardi cliccando alla voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2597,466 +2905,517 @@ msgstr ""
 "Il testo sotto a questa riga è quanto è stato detto dall'ultima volta che si "
 "è prestata attenzione a questa chat di gruppo"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Manca un \"%s\" nell'URL del Dizionario e questo non è WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Ieri"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "%i giorni fa"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "I binding python per D-Bus sono mancanti su questo computer"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Le potenzialità D-Bus di Gajim non possono essere usate"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Nome contatto: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "Nel gruppo"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Nome contatto"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "Messaggio di stato %s"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Salva come messaggio di stato preimpostato"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Inserire un nome per questo messaggio di stato"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Indirizzo:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Indirizzo:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Indirizzo extra:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Inserire i dati del contatto che si vuole aggiungere all'account %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Inserire i dati del contatto che si vuole aggiungere"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Trasporti"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente deve non contenere una risorsa."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Contatto già presente nella lista"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Questo contatto è già presente nella lista."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "ID utente:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "Un client jabber GTK+"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "GRAZIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Dulcis in fundo, ringraziamo tutti i gestori dei pacchetti"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
 "Andrea Ratti <scimiot@yahoo.it>\n"
 "Matteo Dell'Amico <della@linux.it>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Non è possibile entrare nella stanza"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Richiesta di abbonamento per l'account %s da %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Sei già nella stanza %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non è possibile unirsi a chat di gruppo quando non si è connessi."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Nome della stanza o del server non valido"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Il nome della stanza o del server contiene caratteri non permessi."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Introdurre l'ID del contatto a cui\n"
 "mandare un messaggio di chat:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossibile scrivere il file in %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Invito a chat di gruppo"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contatto disconnesso"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
+msgstr "Messaggio singolo con l'account %s"
+
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Descrizione: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato di una linea</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato di una linea</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Chat private"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s ti ha invitato alla stanza %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s diventa:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Creazione notifica speciale per %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Connessione"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Altri"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Conferenze"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca servizi usando l'account %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Ricerca servizi"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3064,46 +3423,51 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controllare "
 "l'indirizzo e riprovare."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Questo tipo di servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Sfoglia %s usando l'account %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Consulta"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Analisi %d / %d..."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Utenti"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Descrizione"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "File"
@@ -3121,7 +3485,7 @@ msgstr "Progresso"
 msgid "Filename: %s"
 msgstr "Nome file: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Dimensione: %s"
@@ -3129,17 +3493,17 @@ msgstr "Dimensione: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Tu"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Mittente: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Destinatario: "
 
@@ -3160,78 +3524,88 @@ msgstr "Trasferimento file annullato"
 msgid "Connection with peer cannot be established."
 msgstr "La connessione non può essere stabilita."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Destinatario: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Inserire il messaggio:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Trasferimento file fermato dal contatto"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Scegliere il file da inviare..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim non riesce a leggere questo file"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Questo file è in uso da un altro processo."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Descrizione: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vuole inviarti un file:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Cosa fare?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Salva file come..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3239,104 +3613,303 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "File non valido"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare file vuoti"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Mittente: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim ha bisogno di un server X per essere eseguito. Uscita..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim ha bisogno di PyGTK 2.6 o superiore"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr ""
+"Gajim ha bisogno di PyGTK 2.6 o superiore per essere eseguito. Uscita..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim ha bisogno di GTK2.6 o superiore"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim ha bisogno di GTK2.6 o superiore per essere eseguito. Uscita..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "Supporto libglade mancante nel runtime GTK+"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Eliminare il runtime GTK+ corrente ed installare l'ultima versione stabile "
+"da %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr "Verificare che GTK+ e PyGTK abbiano supporto libglade sul sistema."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Accettare questa richiesta?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Connessione"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Oggetto: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "errore durante l'invio di %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Autorizzazione accettata"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Il contatto \"%s\" ti ha autorizzato a vedere il suo stato."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Lo vedrai sempre come offline."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Non si può contattare \"%s\""
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Controllare la connessione o riprovare più tardi."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s è ora %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Passphrase errata"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Si è connessi senza la chiave OpenPGP"
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nuova e-mail su %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "C'è %d nuova e-mail"
+msgstr[1] "Ci sono %d nuove e-mail"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s vuole inviarti un file."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Hai ricevuto con successo %(filename)s da %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Hai inviato %(filename)s a %(name)s con successo."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "Inserire i dati per l'account esistente"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Impossibile salvare impostazioni e preferenze"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "mostra un aiuto su di un comando specifico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "mostra aiuto sul comando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Mostra o nascondi la lista contatti"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Apre una finestra con il prossimo messaggio non letto"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr "Stampa la lista contatti. Ogni contatto appare su una linea separata"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "mostra solo i contatti dell'account dato"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Stampa un elenco degli account registrati"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Cambia lo stato degli account"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "stato"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "uno fra: offline, online, chat, assente, xa, non disturbare, invisibile"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "messaggio"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "messaggio di stato"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3345,20 +3918,20 @@ msgstr ""
 "cambiare lo stato di tutti gli account che hanno marcato l'opzione "
 "\"sincronizza con lo stato globale\""
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Mostra la finestra di chat per mandare messaggi ad un contatto"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contatto con cui si vuole chattare"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se specificato, il contatto è preso dalla lista contatti di questo account"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3369,28 +3942,28 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "contenuti messaggi"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "chiave pgp"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se specificato, il messaggio verrà criptato usando questa chiave pubblica"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "se specificato, il messaggio verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3401,130 +3974,145 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Oggetto"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Messaggio inviato"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID del contatto"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Nome dell'account"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Invia file ad un contatto"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Percorso file"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "se specificato, il file verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Mostra tutte le preferenze ed i relativi valori"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Imposta il valore di 'chiave' a 'valore'."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "chiave=valore"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chiave' è il nome della preferenza, 'valore' è il valore a cui impostarla"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Elimina un oggetto dalle preferenze"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "chiave"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "nome della preferenza da eliminare"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Scrive lo stato corrente delle preferenze di Gajim nel file .config"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Aggiunge il contatto alla lista"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Aggiunge un nuovo contatto a questo account"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Restituisce lo stato corrente (quello globale se non è specificato un "
 "account)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Restituisce il messaggio di stato corrente (quello globale se non è "
 "specificato un account)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Restituisce il numero di messaggi non letti"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "Console XML"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3533,16 +4121,11 @@ msgstr ""
 "'%s' non appartiene alla lista contatti.\n"
 "Specificare l'account per l'invio del messaggio."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Non ci sono account attivi"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Versione D-Bus sconosciuta: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3551,16 +4134,16 @@ msgstr ""
 "Uso: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Parametri:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3569,7 +4152,7 @@ msgstr ""
 "Uso: %s comando [parametri]\n"
 "Il comando è uno fra:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3578,328 +4161,134 @@ msgstr ""
 "Il parametro \"%s\" non è specificato. \n"
 "Scrivere\"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim ha bisogno di un server X per essere eseguito. Uscita..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim ha bisogno di PyGTK 2.6 o superiore"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr ""
-"Gajim ha bisogno di PyGTK 2.6 o superiore per essere eseguito. Uscita..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim ha bisogno di GTK2.6 o superiore"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim ha bisogno di GTK2.6 o superiore per essere eseguito. Uscita..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Supporto libglade mancante nel runtime GTK+"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Eliminare il runtime GTK+ corrente ed installare l'ultima versione stabile "
-"da %s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Verificare che GTK+ e PyGTK abbiano supporto libglade sul sistema."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Accettare questa richiesta?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "errore durante l'invio di %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Autorizzazione accettata"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Il contatto \"%s\" ti ha autorizzato a vedere il suo stato."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Lo vedrai sempre come offline."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Non si può contattare \"%s\""
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Controllare la connessione o riprovare più tardi."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s è ora %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Passphrase errata"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Si è connessi senza la chiave OpenPGP"
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Nuova e-mail su %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "C'è %d nuova e-mail"
-msgstr[1] "Ci sono %d nuove e-mail"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s vuole inviarti un file."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Hai ricevuto con successo %(filename)s da %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Hai inviato %(filename)s a %(name)s con successo."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "La vCard è stata pubblicata correttamente"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Le informazioni personali sono state pubblicate con successo."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "Pubblicazione della vCard fallita"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"C'è stato un errore nella pubblicazione delle informazioni personali, "
-"riprovare più tardi."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Impossibile salvare impostazioni e preferenze"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Migrazione log..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Attendere durante la migrazione dei log..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "nome del tema"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Non è possibile eliminare il tema corrente"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Chat privata"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Chat private"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Non sei più nella stanza \"%s\" o \"%s\" è uscito."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Chat di gruppo"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Chat di gruppo"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cambia _nickname"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Questa stanza non ha oggetto"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bandito: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato bandito da %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s è ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s è ora %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Questa stanza non ha oggetto"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Si è invitato %(contact_jid)s a %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s non sembra essere un JID valido"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Comando inesistente: /%s (per inviarlo, scrivere /say prima di esso)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandi: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3912,7 +4301,7 @@ msgstr ""
 "\". Se il JID è correntemente nella stanza, verrà anche cacciato. NON "
 "supporta la presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3920,12 +4309,12 @@ msgstr ""
 "Uso: /%s <nickname>, apre una finestra di chat privata al partecipante "
 "specificato."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, pulisce la finestra di testo."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3934,12 +4323,12 @@ msgstr ""
 "Uso: /%s [motivo], chiude la finestra oi scheda corrente, mostrando il "
 "motivo se specificato."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, nasconde i pulsanti di chat."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3948,7 +4337,7 @@ msgstr ""
 "Uso: /%s <JID> [motivo], invita JID alla stanza corrente, opzionalmente "
 "fornendo un motivo."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -3957,7 +4346,7 @@ msgstr ""
 "Uso: /%s <stanza>@<server>[/nickname], offre la possibilità di entrare in "
 "stanza@server, opzionalmente usando il nickname specificato."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3968,7 +4357,7 @@ msgstr ""
 "nickname dalla stanza e opzionalmente mostra un motivo. NON supporta la "
 "presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -3977,7 +4366,7 @@ msgstr ""
 "Uso: /%s <azione>, invia l'azione alla stanza corrente. Usare la terza "
 "persona (esempio: /%s esplode)."
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -3986,104 +4375,104 @@ msgstr ""
 "Uso: /%s <nickname> [messaggio], apre una finestra di messaggi privati ed "
 "invia il messaggio al partecipante specificato per nickname."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Uso: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr ""
 "Uso: /%s [argomento], mostra o aggiorna l'argomento della stanza corrente."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Uso: /%s [argomento], mostra o aggiorna l'argomento della stanza corrente."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uso: /%s <messaggio>, invia un messaggio senza considerare gli altri comandi."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Non esiste aiuto per /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Si è sicuri di voler uscire dalla stanza \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Chiudendo questa finestra, si verrà disconnessi da questa stanza."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "_Non chiederlo più"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Specificare il nuovo nickname da usare:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Segnalibro già impostato"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "La stanza \"%s\" è già tra i segnalibri."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Il segnalibro è stato aggiunto con successo"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "È possibile gestire i segnalibri attraverso il menu Azioni nella finestra "
 "della lista contatti."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "È stato individuato un errore di programmazione"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4091,90 +4480,90 @@ msgstr ""
 "Probabilmente non è fatale, ma dovrebbe comunque venire segnalato agli "
 "sviluppatori."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Segnala bug"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Dettagli"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Errore nel parsing del file:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Non si è potuto scrivere su %s. Il supporto gestione sessioni non funzionerà"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 #, fuzzy
 msgid "Extension not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salva file come..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Impossibile trovare la base dati delle cronologie"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Contatti"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Nickname"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Messaggio"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Oggetto"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Ripulire il database? (FORTEMENTE SCONSIGLIATO SE GAJIM È IN ESECUZIONE)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4188,20 +4577,16 @@ msgstr ""
 "\n"
 "Nel caso si prema SÌ, attendere..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Esportazione cronologie..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s alle %(time)s ha detto: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "chi"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
@@ -4209,112 +4594,158 @@ msgstr[0] ""
 msgstr[1] ""
 "Si vuole davvero eliminare la cronologia per i contatti selezionati?"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Questa operazione è irreversibile."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Si vuole davvero eliminare il messaggio selezionato?"
 msgstr[1] "Si vuole davvero eliminare i messaggi selezionati?"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Cronologia conversazione con %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ora è %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Messaggi"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s è ora %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s connesso"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s disconnesso"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuovo messaggio singolo da %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Nuovo messaggio privato dalla stanza %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuovo messaggio da %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Impossibile caricare l'immagine"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Invito ricevuto"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "Senza una connessione non è possibile pubblicare i dati personali."
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "Pubblicazione della vCard fallita"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"C'è stato un errore nella pubblicazione delle informazioni personali, "
+"riprovare più tardi."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Senza una connessione, non è possibile ottenere i dati personali."
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Osservatori"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Sei già nella stanza %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "all'account %s"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "usando l'account %s"
@@ -4322,41 +4753,53 @@ msgstr "usando l'account %s"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "dell'account %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Gestione segnalibri..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Gestore cronologia"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Entra in nuova stanza"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "_Entrare in chat di gruppo"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Ci sono messaggi non letti"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4364,67 +4807,86 @@ msgstr ""
 "Non sarai in grado di mandare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Il trasporto \"%s\" verrà rimosso"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Non sarai in grado di mandare e ricevere messaggi verso i contatti di questo "
+"trasporto."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Nuova stanza"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Vorrei aggiungerti ai miei contatti"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Ri_nomina"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Connetti"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "L'autorizzazione è stata inviata"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4432,7 +4894,7 @@ msgstr ""
 "Eliminando questo contatto ne verrà rimossa anche l'autorizzazione. Questi "
 "ti vedrà sempre offline."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4440,36 +4902,51 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Eliminando questo contatto ne verrà rimossa anche l'autorizzazione. Questi "
+"ti vedrà sempre offline."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, 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:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Memorizza passphrase"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Passphrase errata"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Si può selezionare <"
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Stai partecipando ad una o più chat di gruppo"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4477,20 +4954,21 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 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:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Ci sono messaggi non letti"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4498,145 +4976,111 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Sposta %s nel gruppo %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Rendere %s e %s metacontatti"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Cambia messaggio di stato..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Nascondi questo menu"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d messaggio non letto"
-msgstr[1] "Gajim - %d messaggi non letti"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d messaggio non letto"
-msgstr[1] "Gajim - %d messaggi non letti"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d messaggio singolo non letto"
-msgstr[1] "Gajim - %d messaggi singoli non letti"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d messaggio in chat di gruppo non letto"
-msgstr[1] "Gajim - %d messaggi in chat di gruppo non letti"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d messaggio privato non letto"
-msgstr[1] "Gajim - %d messaggi privati non letti"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Ruolo: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Affiliazione: "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Risorsa: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Stato: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Abbonamento: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Stato: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Ultimo stato su %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Da %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "da %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "ID Jabber: "
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Scarica"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Invia"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Trasferito: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Non iniziato"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Fermato"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Completato"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "In stallo"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4644,25 +5088,25 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Impossibile caricare l'immagine"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "da %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Affiliazione: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4670,7 +5114,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4678,14 +5122,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 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:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4693,28 +5137,16 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 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:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
-#: ../src/vcard.py:458
-msgid "Without a connection you can not publish your contact information."
-msgstr "Senza una connessione non è possibile pubblicare i dati personali."
-
-#: ../src/vcard.py:491
-msgid "Without a connection, you can not get your contact information."
-msgstr "Senza una connessione, non è possibile ottenere i dati personali."
-
-#: ../src/vcard.py:495
-msgid "Personal details"
-msgstr "Informazioni personali"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "creazione database log"
 
@@ -4739,95 +5171,88 @@ msgstr "%s è una cartella ma dovrebbe essere un file"
 msgid "creating %s directory"
 msgstr "creazione della cartella %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "La dipendenza pysqlite2 (o python-pysqlite2) è mancante. Uscita..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Servizio non disponibile: Gajim non è in esecuzione, o remote_control è "
-"Falso."
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr ""
-"D-Bus non è presente su questa macchina o il relativo modulo python è "
-"mancante"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Il bus di sessione non è disponibile.\n"
-"Provare a leggere http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usa DBus e Notification-Daemon per mostrare le notifiche"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo in minuti dopo il quale lo stato diventa \"assente\"."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Assente per inattività"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo in minuti dopo il quale lo stato diventa \"non disponibile\"."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Non disponibile per inattività"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:88
+msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Si può selezionare <"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se Vero, non verranno rimossi */_. *abc* verrà mostrato in grassetto ma "
 "senza rimuovere * *."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Aggiungere * e [n] al titolo della lista contatti?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4835,12 +5260,12 @@ msgstr ""
 "Quante linee ricordare dalla precedente conversazione quando una scheda/"
 "finestra di chat viene riaperta."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Quanti minuti devono durare le ultime linee dalla conversazione precedente."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4848,11 +5273,11 @@ msgstr ""
 "Inviare il messaggio con Ctrl-Invio e con Invio creare una nuova linea "
 "(comportamento predefinito del client Mirabilis ICQ)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quante linee memorizzare per Ctrl+Alto."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4861,22 +5286,22 @@ msgstr ""
 "URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
 "che significa usare wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se marcato, Gajim può essere controllato da remoto usando gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Chiedere prima di chiudere una finestra/scheda di chat di gruppo."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4884,7 +5309,7 @@ msgstr ""
 "Chiedere sempre prima di chiudere una finestra/scheda di chat di gruppo in "
 "questa lista separata da spazi di jid di stanze."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4892,7 +5317,7 @@ msgstr ""
 "Non chiedere mai prima di chiudere una scheda/finestra di chat in questa "
 "lista separata da spazi di jid di stanze."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4900,24 +5325,24 @@ msgstr ""
 "Imposta l'host inviato per il trasferimento file in caso di traduzione di "
 "indirizzo/port forwarding."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Secondo lo standard IEC, KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Mostrare scheda quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrare bordo per le schede quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4925,7 +5350,7 @@ msgstr ""
 "Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
 "chat multi-utente."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4934,11 +5359,11 @@ msgstr ""
 "cliccato. Questa impostazione è presa in considerazione solo se viene usata "
 "l'icona nello spazio di notifica."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Se Vero, Gajim si registra per xmpp:// ad ogni avvio."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4946,15 +5371,16 @@ msgstr ""
 "Se Vero, Gajim mostrerà un icona su ogni scheda contenente messaggi non "
 "letti. A seconda del tema, questa icona può essere animata."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Se Vero, Gajim mostrerà il messaggio di stato, se non vuoto, per ogni "
 "contatto sotto il nome del contatto nella finestra dei contatti"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4962,7 +5388,7 @@ msgstr ""
 "Se Vero, Gajim chiederà un avatar ad ogni contatto che non aveva un avatar "
 "l'ultima volta o ne ha uno troppo vecchio in cache."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4971,20 +5397,29 @@ msgstr ""
 "Se Falso, non si vedrà più la linea di stato nelle chat quando un contatto "
 "cambia stato o messaggio di stato."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4994,17 +5429,19 @@ msgstr ""
 "finestra lampeggia (comportamento predefinito per la maggior parte dei "
 "gestori di finestre) quando contiene nuovi eventi."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 non vuole informazioni SHA quando ci si unisce ad una stanza "
 "protetta da password. Impostare a Falso per smettere di inviare informazioni "
 "SHA nella presenza sulle chat di gruppo"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5012,7 +5449,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Controlla la finestra dove vengono messi i nuovi messaggi.\n"
 "'always' - Tutti i messaggi vengono inviati ad una singola finestra.\n"
@@ -5023,53 +5460,68 @@ msgstr ""
 "ad una specifica finestra. Nota, cambiare questa opzione richiede il riavvio "
 "di Gajim prima che le modifiche abbiano effetto"
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se Falso, l'avatar non verrà mostrato nella finestra di chat"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Nasconde i pulsanti nella finestra di chat di gruppo"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Nasconde i pulsanti nella finestra di chat a due persone"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Nasconde l'intestazione in una finestra di chat di gruppo"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Nasconde l'intestazione nella finestra di chat a due persone"
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr ""
 "Nasconde la lista dei presenti nella stanza nella finestra di chat di gruppo"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Workaround Jabberd2"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5077,59 +5529,106 @@ msgstr ""
 "Se marcato, Gajim userà l'IP della macchina ed i proxy definiti nell'opzione "
 "file_transfer_proxies per il trasferimento file."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Non è possibile usare OpenPGP su questo computer"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Di ritorno tra qualche minuto."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Mangio"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Sto mangiando, lascia pure un messaggio"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Lavoro"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Sono al telefono"
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Fuori"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Sono fuori a divertirmi"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Disponibile"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Libero per chat"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Servizio non disponibile"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5137,7 +5636,7 @@ msgstr ""
 "Suono da riprodurre quando un messaggio MUC contiene una delle parole in "
 "muc_highlight_words, o quando un messaggio MUC contiene il tuo nickname."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5145,33 +5644,140 @@ msgstr ""
 "Suono da riprodurre quando arriva un messaggio MUC (questa impostazione ha "
 "valore solo se notify_on_all_muc_messages è Vero)."
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr "Impossibile caricare il modulo idle"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Passphrase errata"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+"Le informazioni di registrazione per il transport %s non sono arrivate in "
+"tempo"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Nickname non trovato: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Non è possibile entrare nella stanza"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "È necessaria una password per entrare in questa stanza."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Sei bandito da questa stanza."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Questa stanza non esiste."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "Non è permessa la creazione di stanze."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "È necessario usare il nickname registrato."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Non appartieni alla lista dei membri."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Il nickname desiderato è in uso o registrato da un altro partecipante.\n"
+"Specificare un altro nickname sotto:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Vorrei aggiungerti ai miei contatti."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "si è ora abbonati a %s"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "richiesta di cancellazione abbonamento da %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "è stato ora cancellato l'abbonamento a %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Il JID %s non rispetta le RFC. Non verrà aggiunto ai contatti. Usare "
+"strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
+"rimuoverlo"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Per continuare a mandare e ricevere messaggi, è necessario riconnettersi."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
@@ -5179,65 +5785,71 @@ msgstr ""
 "registrazione."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Risposta non valida"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non ci si è potuti collegare a \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Connesso al server %s:%s con %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Controllare la connessione o riprovare più tardi"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Verificare la correttezza di login e password."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "Non è stata impostata la passphrase OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ci si connetterà a %s senza OpenPGP"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "invisibile"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Sono %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5246,301 +5858,562 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Vorrei aggiungerti ai miei contatti."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
-msgid "Unable to load idle module"
-msgstr "Impossibile caricare il modulo idle"
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "I binding python per D-Bus sono mancanti su questo computer"
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Le potenzialità D-Bus di Gajim non possono essere usate"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "La dipendenza pysqlite2 (o python-pysqlite2) è mancante. Uscita..."
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
-"Le informazioni di registrazione per il transport %s non sono arrivate in "
-"tempo"
+"Servizio non disponibile: Gajim non è in esecuzione, o remote_control è "
+"Falso."
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Non è possibile entrare nella stanza"
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr ""
+"D-Bus non è presente su questa macchina o il relativo modulo python è "
+"mancante"
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "È necessaria una password per entrare in questa stanza."
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Il bus di sessione non è disponibile.\n"
+"Provare a leggere http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Sei bandito da questa stanza."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Nessuno"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Questa stanza non esiste."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "chi"
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "Non è permessa la creazione di stanze."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Via:"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "È necessario usare il nickname registrato."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Porta: "
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Non appartieni alla lista dei membri."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "file"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
 msgstr ""
-"Il nickname desiderato è in uso o registrato da un altro partecipante.\n"
-"Specificare un altro nickname sotto:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "si è ora abbonati a %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Evento"
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "richiesta di cancellazione abbonamento da %s"
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "è stato ora cancellato l'abbonamento a %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Continua"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Elimina"
 
-#: ../src/common/connection_handlers.py:1680
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgid "%0 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
 msgstr ""
-"Il JID %s non rispetta le RFC. Non verrà aggiunto ai contatti. Usare "
-"strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
-"rimuoverlo"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Registra a %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Lavoro"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Nessuno"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Evento"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Carattere non valido nel nome utente."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Indirizzo del server richiesto."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Carattere non valido nell'hostname."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Carattere non valido nella risorsa."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "O_ccupato"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Non disponibile"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Libero per chat"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Libero per chat"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Disponibile"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "_Assente"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Assente"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "_Invisibile"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "Ci sono errori"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Da"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Entrambi"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Nessuno"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Proprietario"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Amministratore"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Membro"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "sta facendo altro"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "sta scrivendo..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "si è fermato mentre scriveva un messaggio"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o scheda di chat"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d messaggio non letto"
+msgstr[1] "Gajim - %d messaggi non letti"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d messaggio singolo non letto"
+msgstr[1] "Gajim - %d messaggi singoli non letti"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d messaggio in chat di gruppo non letto"
+msgstr[1] "Gajim - %d messaggi in chat di gruppo non letti"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d messaggio privato non letto"
+msgstr[1] "Gajim - %d messaggi privati non letti"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "errore: impossibile aprire %s per lettura"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "cyan"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "creazione database log"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "con l'account %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Impossibile caricare l'immagine"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Non ci si è potuti collegare a \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Questo messaggio è cifrato]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "A_bbonati"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Indirizzo"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Assente"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Scarica"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Creazione notifica speciale per %s"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Non disponibile"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Elimina"
+
+#~ msgid "Contact _Info"
+#~ msgstr "_Informazioni contatto"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informazioni sul contatto"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Nome della stanza o del server non valido"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Versione D-Bus sconosciuta: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "La vCard è stata pubblicata correttamente"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Le informazioni personali sono state pubblicate con successo."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Migrazione log..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Attendere durante la migrazione dei log..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Entra in nuova stanza"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Nascondi questo menu"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d messaggio non letto"
+#~ msgstr[1] "Gajim - %d messaggi non letti"
+
+#~ msgid "Since %s"
+#~ msgstr "Da %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Autorizza automaticamente il contatto"
 
@@ -5776,18 +6649,12 @@ msgstr "cyan"
 #~ msgid "(%s/s)"
 #~ msgstr "(%s/s)"
 
-#~ msgid "Service not available"
-#~ msgstr "Servizio non disponibile"
-
 #~ msgid "Session bus is not available."
 #~ msgstr "Il bus di sessione non è disponibile."
 
 #~ msgid "Kind"
 #~ msgstr "Tipo"
 
-#~ msgid "with account %s"
-#~ msgstr "con l'account %s"
-
 #~ msgid "with account "
 #~ msgstr "con l'account "
 
@@ -5960,9 +6827,6 @@ msgstr "cyan"
 #~ msgid "Click to get contact's extended information"
 #~ msgstr "Cliccare per ottenere informazioni estese sul contatto"
 
-#~ msgid "Enter your message:"
-#~ msgstr "Inserire il messaggio:"
-
 #~ msgid ""
 #~ "If checked, all chat and group chat windows will have the information "
 #~ "area in the top and the buttons area in the bottom hidden. You can quick "
@@ -5977,18 +6841,12 @@ msgstr "cyan"
 #~ msgid "Join _Group Chat..."
 #~ msgstr "Entra in chat di _gruppo..."
 
-#~ msgid "Please fill in the data for your existing account"
-#~ msgstr "Inserire i dati per l'account esistente"
-
 #~ msgid "Show roster window on Gajim startup"
 #~ msgstr "Mostra la finestra dei contatti all'avvio di Gajim"
 
 #~ msgid "_Compact View"
 #~ msgstr "_Vista compatta"
 
-#~ msgid "_Join Group Chat"
-#~ msgstr "_Entrare in chat di gruppo"
-
 #~ msgid "_Refresh"
 #~ msgstr "_Aggiorna"
 
diff --git a/po/nb.po b/po/nb.po
index b433a1024..a9d4f570d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,12 +2,12 @@
 # This file is distributed under the same license as the Gajim package.
 # Stian B. Barmen <stian@jabber.no>, 2005.
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-04-26 00:29+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -17,15 +17,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Bookmarks: -1,775,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Gajim Instant Messenger"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
@@ -42,16 +42,23 @@ msgid "_Discover Services..."
 msgstr "_Oppdag Tjenester..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Gruppe Samtale"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Åpne ny Epost"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
 
@@ -105,7 +112,7 @@ msgid "Pass_word:"
 msgstr "Pass_ord:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
@@ -130,7 +137,7 @@ msgid "Your JID:"
 msgstr "Din JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Avansert"
 
@@ -144,7 +151,7 @@ msgid "_Host:"
 msgstr "_Maskin:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Passord:"
 
@@ -176,10 +183,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Informasjon</b>"
 
@@ -196,6 +205,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Koble til på nytt automatisk når kontakten mistes"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "K_oble til når Gajim starter"
 
@@ -216,6 +226,7 @@ msgstr ""
 "deaktivert."
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Velg _Nøkkel..."
 
@@ -232,16 +243,16 @@ msgid "Edit Personal Information..."
 msgstr "Rediger Personlig Informasjon..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Generelle"
 
@@ -267,6 +278,7 @@ msgstr ""
 "frakobling på grunn av inaktivitet"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -275,6 +287,7 @@ msgstr ""
 "bare for deg"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -283,6 +296,7 @@ msgstr ""
 "ved oppstart"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -299,18 +313,23 @@ msgstr "Informasjon om deg, slik som den er lagret på serveren"
 msgid "Manage..."
 msgstr "Behandle..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Ingen"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
@@ -333,14 +352,18 @@ msgstr ""
 "Klienten med den høyeste prioriteten vil få hendelsen"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Ressu_rs:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -354,40 +377,46 @@ msgstr ""
 "navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
 "hendelsene. (se under)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Lagre _passord setning (usikkert)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Bruk _SSL (gammel)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Bruk filoverførings proxier"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Navn:"
 
@@ -397,63 +426,92 @@ msgstr "Kontoer"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste alle "
 "kontakter som om du hadde en konto"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Slå sammen kontoer"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Endre"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Fjern"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Konto"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Legg til ny Kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Konto"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Gruppe:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Kallenavn:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protokoll:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Abbonér"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Re_gistrer"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "Bruker ID:"
@@ -544,82 +602,63 @@ msgstr "<b>Lyder</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Adresse"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "Av_anserte Handlinger"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Status: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Borte"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Opptatt"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Last ned"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "kommando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Legg til Spesiell Alarm for %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Ledig for Prat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -632,75 +671,75 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Gjemmer knappene i gruppe samtale vindu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Bruk et enkelt samtalevindu med _faner"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Port:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -735,7 +774,7 @@ msgstr "Bli med i _Gruppe Samtale"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
@@ -756,7 +795,8 @@ msgid "_Open Link in Browser"
 msgstr "_Åpne Link i Nettleser"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Start Samtale"
@@ -766,7 +806,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Klikk for å se tidligere samtaler med denne kontakten"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Send _Fil"
 
@@ -782,7 +823,8 @@ msgstr "_Kompakt Utseende    Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historie"
 
@@ -846,7 +888,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -883,39 +925,34 @@ msgstr ""
 "Fane"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Fet"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Skriver"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Font stil:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Gajim Tema Valg"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Borte"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -923,7 +960,7 @@ msgstr ""
 "MUC\n"
 "Meldinger"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -931,19 +968,19 @@ msgstr ""
 "MUC Sendte\n"
 "Meldinger"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Pauset"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "Tekst _farge:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "Tekst _font:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Bakgrunn:"
 
@@ -1062,7 +1099,7 @@ msgid "Accept"
 msgstr "Godkjenn"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Nekt"
 
@@ -1070,13 +1107,14 @@ msgstr "Nekt"
 msgid "Invitation Received"
 msgstr "Invitasjon motatt"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
@@ -1094,13 +1132,8 @@ msgstr "Nylig:"
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1125,6 +1158,10 @@ msgstr "Behandle Bokmerker"
 msgid "Print status:"
 msgstr "Utskrifts tid:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Server:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Tittel:"
@@ -1146,7 +1183,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Navn:"
 
@@ -1162,20 +1200,21 @@ msgstr "Bruk autentisering"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikk for å sette inn et uttrykksikon (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Kryptering"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Handlinger"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Send"
 
@@ -1249,18 +1288,25 @@ msgid "Also known as iChat style"
 msgstr "Også kjent som iChat stil"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Auto _borte etter:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Auto _ikke tilgjengelig etter:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1272,19 +1318,19 @@ msgstr ""
 "Alltid bruk KDE standard applikasjoner\n"
 "Egendefinert"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "F_ør kallenavn:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Samtale"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Samtale status opp_lysninger:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1294,35 +1340,40 @@ msgstr ""
 "Bruk med varsomhet, fordi det blokkerer alle meldinger fra lle kontakter som "
 "ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Status Melding"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "Standard status _ikonsamling:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "H_vert 5 minutt"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Uttrykksikoner:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1332,21 +1383,21 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Gajim vil autmatisk vise deg den nye hendelser ved å sprette opp det "
 "relative vinduet"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
 msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1354,7 +1405,7 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget inn"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1362,13 +1413,19 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget ut"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim vil bare endre ikonet til kontakten som har sendt den nye hendelsen"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1376,7 +1433,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1384,7 +1441,7 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1392,7 +1449,7 @@ msgstr ""
 "Dersom valgt vil Gajim huske kontaktliste og samtalevindu posisjoner på "
 "skjermen, samt størrelsen på de til neste gang du åpner de"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1401,7 +1458,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
 "vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1409,11 +1466,11 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1425,80 +1482,84 @@ msgstr ""
 "Per konto\n"
 "Per type"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Alarmer meg om kontakter som:"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Alarmer meg on nye _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "På hver _melding"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "En melding _vindu:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Utskrifts tid:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "Lagre _posisjon og størrelse for kontaktliste og samtalevinduer"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Den automatiserte borte meldinen"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Den autmatiserte ikke tilgjengelig meldingen"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Bruk _transportenes ikoner"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1510,151 +1571,160 @@ msgstr ""
 "melding hendelser vil bare skje dersom du får en ny melding fra en kontakt "
 "du ikke er i samtale med."
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Når en ny hendelse blir motatt"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "_Etter tid:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "_Før tid:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Font:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "_Innkommende melding:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Aldri"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Gi meg beskjed om det"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "_Utgående melding:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Spiller:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Sprett opp"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "_Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minutter"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Private Samtaler"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "K_oble til når Gajim starter"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Slett"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Listen over Utestengte"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Abonement"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "I gruppen"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1662,32 +1732,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Send melding"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Forespør hans/hennes status"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Om"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adresse"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Velg _Avatar"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Fødselsdag:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "By:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Bedrift:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Land:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Avdeling:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Post:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Ekstra Adresse:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Etternavn:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: YYYY-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Fornavn:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Hjemmeside:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Mellomnavn:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Mer"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Personlig Informasjon"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefon Nummer:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Plassering:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Post Kode:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Tittel:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Rolle:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Fylke:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Gate:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Suffix:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Jobb"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Publisér"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Hent"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1707,47 +1917,58 @@ msgid "A_sk to see his/her status"
 msgstr "Forespør hans/hennes status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Legg til Spesiell _Alarm"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Tilegn Open_PGP Nøkkel"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Send _Melding"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Forby han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Abonement"
 
@@ -1772,42 +1993,53 @@ msgid "Help online"
 msgstr "Hjelp online"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Profil, Bilde"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transporter"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Instillinger"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Avslutt"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Stemme"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "G_å"
@@ -1877,22 +2109,18 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Godkjenn kontakt så han kan vite når du er tilkoblet"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "Kontakt_Info"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "Avslå godkjenning fra kontakt så han ikke kan se når du er tilkoblet"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Abbonerings Forespørsel"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Godkjenn"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Nekt"
 
@@ -1908,164 +2136,51 @@ msgstr "Vis _Kontaktliste"
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Om"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adresse"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Spør:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Fødselsdag:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "By:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Bedrift:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Kontaktinformasjon"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Land:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Avdeling:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "E-Post:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Ekstra Adresse:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Etternavn:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: YYYY-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Fornavn:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Hjemmeside:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakter"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Plassering"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Mellomnavn:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Mer"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Telefon Nummer:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Plassering:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Post Kode:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Tittel:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ressurs:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Rolle:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Velg _Avatar"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Fylke:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Gate:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Abbonement:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Suffix:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Jobb"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Publisér"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Hent"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafikk</b>"
@@ -2097,30 +2212,165 @@ msgstr "_Melding"
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Navn:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Navn:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Personlige detaljer"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Rediger Konto..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Bruk egendefinert maskinnavn/port"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Skrive"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Ingen)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Gjemt"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Generelle"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "grønn"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Plassering"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Kursiv"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Publisér"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2136,52 +2386,62 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Samtaler"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s: %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s har ikke publisert en OpenPGP nøkkel og du har ikke tilegnet en"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "ikke i kontaktliste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2189,80 +2449,96 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Hvert %s _minutt"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Tilkobling ikke tilgjengelig"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Neste Melding Motatt"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2270,146 +2546,175 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 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:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "Du må lage en konto før du kan redigere din personlige informasjon."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Du har ingen aktiv konto"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Konto Navnet er Allerede i Bruk"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2417,11 +2722,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2429,11 +2734,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2441,11 +2746,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2453,7 +2758,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2469,87 +2774,88 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nytt Rom"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Gruppe Samtale"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Duplikat Jabber ID"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Kontakten er allerede konfigurert i Gajim."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2558,23 +2864,23 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Det skjedde en feil ved oppretting av kontoen"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2582,464 +2888,515 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
 "i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python bindinger mangler på denne maskinen"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens navn: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Adresse:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Adresse:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Ekstra Adresse:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "Bruker ID:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Sist men ikke minst ønsker vi å takke alle de som lager installasjonspakker."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abbnerings ønske for konto %s fra %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abbonerings ønske fra %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Du er allerede i rom %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Ugyldig rom eller servernavn"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Ugyldig Jabber ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Rom navnet eller server navnet inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Fyll kontakt ID til den kontakten du ønsker\n"
 "å sende en melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Tilbkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Kontakt Logget Av"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
+msgstr "Enslig Melding med konto %s"
+
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
 msgstr "Enslig Melding med konto %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Beskrivelse: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Private Samtaler"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s har invitert deg til %(room_jid)s rom"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Tilkobling"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3047,46 +3404,51 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Utforsk %s med %s kontoen"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanner %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Beskrivelse"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Fil"
@@ -3104,7 +3466,7 @@ msgstr "Fremdrift"
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %s"
@@ -3112,17 +3474,17 @@ msgstr "Størrelse: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Mottaker: "
 
@@ -3143,78 +3505,88 @@ msgstr "Fil overføring avbrutt"
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen kan ikke opprettes."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Mottaker: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Feil under lesing av fil:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Fil overføringen ble stoppet av kontakten på den andre siden"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3222,58 +3594,257 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim trenger en Xserver for å kjøre. Avslutter..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim trenger PyGTK 2.6 eller høyere"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim tenger PyGTK 2.6 eller høyere for å kjøre. Avslutter..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim trenger GTK 2.6 eller høyere"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim trenger GTK 2.6 eller høyere for å kjøre. Avslutter..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ mangler libglade støtte"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
+"versjon fra %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim trenger PySQLite2 for å kjøre"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim trenger PySQLite2 for å kjøre"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autentisering for %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Godtar du denne forespørselen?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Tilkobling"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Tittel: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "feil ved sending %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Godkjenningsforespørel akseptert"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakten \"%s\" fjernet abbonementet fra deg"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Du vil alltid se han eller henne som frakoblet."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt med \"%s\" kan ikke opprettes"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s er nå %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Passord setningen din er ikke riktig"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Ny E-post på %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Du har %d ny E-post melding"
+msgstr[1] "Du har %d nye E-post meldinger"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s ønsker å sende deg en fil."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Du har vellykket sendt %(filename)s til %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Vennligst fyll in data for din nye konto</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Kan ikke lagre dine instillinger og valg"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Aktiver nytt vindu med den neste uleste melingen"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3281,48 +3852,48 @@ msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "melding"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3330,19 +3901,19 @@ msgstr ""
 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
 "til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3353,28 +3924,28 @@ msgstr ""
 "konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP "
 "nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3385,129 +3956,144 @@ msgstr ""
 "konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP "
 "nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Tittel"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Melding Sendt"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Viser alle instillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på instillingen, 'verdi' er gjeldende instilling"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Sletter en instilling"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "navnet på instillingen som skal slettes"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim instillinger til .config filen"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Legger til ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer instillinger (globale instillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Returnerer gjeldende status melding (den globale om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Start samtale med konto %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "XML Konsoll"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3516,16 +4102,11 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Venligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Ukjent D-Bus versjon: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3534,16 +4115,16 @@ msgstr ""
 "Bruk: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3552,7 +4133,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3561,330 +4142,136 @@ msgstr ""
 "Argumenteet \"%s\" er ikke spesifisert. \n"
 "Skriv \"%s hjelp %s\" for mer informasjon"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim trenger en Xserver for å kjøre. Avslutter..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim trenger PyGTK 2.6 eller høyere"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim tenger PyGTK 2.6 eller høyere for å kjøre. Avslutter..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim trenger GTK 2.6 eller høyere"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim trenger GTK 2.6 eller høyere for å kjøre. Avslutter..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ mangler libglade støtte"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
-"versjon fra %s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim trenger PySQLite2 for å kjøre"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autentisering for %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Godtar du denne forespørselen?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "feil ved sending %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Godkjenningsforespørel akseptert"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakten \"%s\" fjernet abbonementet fra deg"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Du vil alltid se han eller henne som frakoblet."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt med \"%s\" kan ikke opprettes"
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s er nå %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Passord setningen din er ikke riktig"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Ny E-post på %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Du har %d ny E-post melding"
-msgstr[1] "Du har %d nye E-post meldinger"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s ønsker å sende deg en fil."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Du har vellykket sendt %(filename)s til %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "vCard publisering vellykket"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Din personlige informasjon har blitt publisert uten feil."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "vCard publisering feilet"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Det skjedde en feil med publisering av din personlige informasjon, prøv "
-"igjen senere."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Kan ikke lagre dine instillinger og valg"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Migrerer Logger..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Vennligst vent mens loggene blir migrert..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "tema navn"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette ditt gjeldene tema"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Privat Samtale"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Du er ikke lenger i rommet \"%s\" eller \"%s\" har dratt."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Gruppe Samtale"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Endre _Kallenavn"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Dette rommet har ingen tittel"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s er nå %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Dette rommet har ingen tittel"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ser ikke ut til å være en gyldig JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Ingen slik kommando: /%s (dersom du ønsker å sende dette, så skriv /say før "
 "teksten)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3897,7 +4284,7 @@ msgstr ""
 "\". Skulle en bruker med den JIDen være tilstede i rommet vil denne også bli "
 "kastet ut. Det støttes ikke med mellomrom i kallenavnet."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3905,12 +4292,12 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den "
 "spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3919,12 +4306,12 @@ msgstr ""
 "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
 "dersom spesifisert."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Bruk: /%s, gjemmer samtale knappene."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3933,7 +4320,7 @@ msgstr ""
 "Bruksanvisning: /%s <JID> [årsak], inviterer JID til gjeldende rom, og viser "
 "en årsak dersom spesifisert."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -3942,7 +4329,7 @@ msgstr ""
 "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
 "gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3953,7 +4340,7 @@ msgstr ""
 "kallenavn fra rommet og viser om spesifisert en årsak. Støtter ikke "
 "mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -3962,7 +4349,7 @@ msgstr ""
 "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
 "tredje person. (f.eks. /%s eksploderer.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -3971,25 +4358,25 @@ msgstr ""
 "Bruk: /%s <kallenavn> [melding], åpner et privat meldingsvindu og sender "
 "meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende rom."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer gjeldende rom tittel."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer gjeldende rom tittel."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -3997,78 +4384,78 @@ msgstr ""
 "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
 "kommandoer."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av rommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Dersom du lukker dette vinduet, så vil du bli koblet fra dette rommet."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Rommet \"%s\" er allerede i dine bokmerker."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Utvis %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "En programmerings feil har blitt detektert"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4076,87 +4463,87 @@ msgstr ""
 "Det er sannynligvis ikke kritisk, men bør rapporteres til utviklerene "
 "likevel."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Rapporter Feil"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Feil under traversering av fil:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Kunne ikke skrive til %s. Sesjons Håndterings støtte vil ikke virke."
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Lagre Fil som..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Melding"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Tittel"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Ønsker du å rengjøre databasen? (STERKT FRARÅDET MENS GAJIM KJØRER)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4170,131 +4557,173 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "hvem"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Ønsker du virkelig å slette loggene til den valgte kontakten?"
 msgstr[1] "Ønsker du virkelig å slette loggene fra de valgte kontaktene?"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s er nå %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Melding fra rom %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Kunne ikke laste bilde"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Invitasjon motatt"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "vCard publisering feilet"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Det skjedde en feil med publisering av din personlige informasjon, prøv "
+"igjen senere."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Uten en tilkobling kan du ikke hente din kontakt informasjon."
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observerere"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Du er allerede i rom %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
@@ -4302,41 +4731,53 @@ msgstr "på %s kontoen"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Behandle Bokmerker..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Bli med i Nytt Rom"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Du har uleste meldinger"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4344,69 +4785,88 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
 "transporten."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Transport \"%s\" vil bli fjernet"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
+"transporten."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Nytt Rom"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Logg på"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4414,7 +4874,7 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han "
 "eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4422,36 +4882,51 @@ 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:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han "
+"eller henne alltid vil se deg som frakoblet."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4459,19 +4934,20 @@ 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:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 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:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Du har uleste meldinger"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4479,145 +4955,111 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Tøm %s i samtalerom %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Gjem dette vinduet"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d ulest melding"
-msgstr[1] "Gajim - %d uleste meldinger"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d ulest melding"
-msgstr[1] "Gajim - %d uleste meldinger"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d ulest melding"
-msgstr[1] "Gajim - %d uleste meldinger"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d ulest melding"
-msgstr[1] "Gajim - %d uleste meldinger"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d ulest privat melding"
-msgstr[1] "Gajim - %d uleste private meldinger"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Rolle: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Tilhørighet: "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Status: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Abbonement: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Siste status på %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Siden %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "siden %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Komplett"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4625,25 +5067,25 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Kunne ikke laste bilde"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Tilhørighet: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4651,7 +5093,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4659,13 +5101,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 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:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4673,27 +5115,15 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 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:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: ../src/vcard.py:458
-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:491
-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:495
-msgid "Personal details"
-msgstr "Personlige detaljer"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "lager logg database"
 
@@ -4718,94 +5148,88 @@ msgstr "%s er en katalog men skulle vært en fil"
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-"pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt "
-"til False"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus finnes ikke på denne maskinen eller python modulen mangler"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Sesjons bussen er ikke tilgjengelig.\n"
-"Prøv å les http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Bruk DBus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før status endres til borte."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Borte på grunn av inaktivitet"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før status endres til ikke tilgjengelig."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Ikke tilgjengelig på grunn av inaktivitet"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formatterings symboler."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli "
 "fjernet."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4813,12 +5237,12 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4826,11 +5250,11 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4839,21 +5263,21 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4861,7 +5285,7 @@ msgstr ""
 "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4869,7 +5293,7 @@ msgstr ""
 "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4877,30 +5301,30 @@ msgstr ""
 "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
 "adresse oversetting/port videresending."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis fane felt ved bare en aktiv samtale?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtale."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4908,11 +5332,11 @@ msgstr ""
 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
 "på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Dersom True vil Gajim registreres for xmpp:// ved hver oppstart."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4920,15 +5344,16 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4936,7 +5361,7 @@ msgstr ""
 "Dersom True vil Gajim spør etter ikonbilde for hver kontakt som ikke hadde "
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4945,20 +5370,29 @@ msgstr ""
 "Dersom False vil du ikke lenge kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4968,17 +5402,19 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 liker ikke sha informasjon når man går inn i et passord beskyttet "
 "samtalerom. Sett dette valget til False for å slutte å sende sha informasjon "
 "til gruppesamtaler"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4986,7 +5422,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Kontrollerer vinduet hvor nye meldinger skal plasseres.\n"
 "'alltid' - Alle meldinger sendes til ett vindu.\n"
@@ -4996,52 +5432,67 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Dersom True vil man kunne lukke fane/vindu med escape knappen"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Gjemmer knappene i gruppe samtale vindu"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Gjemmer knappene i to personers samtale vindu"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5049,59 +5500,106 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Tilgjengelig"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Ledig for Prat"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Ikke tilgjengelig"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5109,7 +5607,7 @@ msgstr ""
 "Lyd som spilles når en MUC melding inneholder et av ordene i "
 "muc_highlight_words, eller når en MUC melding inneholder ditt kallenavn."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5117,96 +5615,209 @@ msgstr ""
 "Lyd som spilles når en ny MUC melding kommer. (Denne instillingen er kun "
 "aktiv når notify_on_all_muc_messages er True)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Feil Passordsetning"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Kallenavn ikke funnet: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Et passord kreves for å bli med i dette samtalerommet."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Du er uønsket i dette rommet."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Et slikt rom finnes ikke."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "Rom oppretting er begrenset."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Ditt registrerte kallenavn må bli brukt. "
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Du er ikke medlems listen."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
+"samtalebruker.\n"
+"Vennligst skriv et annet kallenavn under:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Jeg vil legge deg til min kontaktliste."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "vi abbonerer nå på %s"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "frakoblings ønske fra %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "vi abbonerer ikke lenger på %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Jid %s er ikke RFC kompatilbel. Den vil ikke bli lagt til kontaktlisten. "
+"Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ "
+"for å fjerne den"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "For å sende og motta meldinger må du koble til på nytt."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Transporten %s svarte feil på registrerings forespørselen."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Tilkoblet til server %s:%s med %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilbkoblet til %s uten OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "usynlig"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Jeg er %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5215,301 +5826,561 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Jeg vil legge deg til min kontaktliste."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python bindinger mangler på denne maskinen"
+
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
+"pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt "
+"til False"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus finnes ikke på denne maskinen eller python modulen mangler"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Sesjons bussen er ikke tilgjengelig.\n"
+"Prøv å les http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
+msgid "one"
+msgstr "Ingen"
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "hvem"
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Gate:"
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Et passord kreves for å bli med i dette samtalerommet."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Port:"
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Du er uønsket i dette rommet."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "fil"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Et slikt rom finnes ikke."
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "Rom oppretting er begrenset."
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Hendelse"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Ditt registrerte kallenavn må bli brukt. "
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Du er ikke medlems listen."
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Fortsett"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
 msgstr ""
-"Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
-"samtalebruker.\n"
-"Vennligst skriv et annet kallenavn under:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi abbonerer nå på %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Slett"
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "frakoblings ønske fra %s"
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi abbonerer ikke lenger på %s"
+msgid "%0 o'clock"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
 msgstr ""
-"Jid %s er ikke RFC kompatilbel. Den vil ikke bli lagt til kontaktlisten. "
-"Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ "
-"for å fjerne den"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Registrer til %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Jobber"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Ingen"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Hendelse"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Ikke tilgjengelig"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Borte"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Fra"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Abbonér"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Modererere"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Modererer"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Eier"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrator"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Medlem"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "skriver en melding..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d ulest melding"
+msgstr[1] "Gajim - %d uleste meldinger"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d ulest melding"
+msgstr[1] "Gajim - %d uleste meldinger"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d ulest melding"
+msgstr[1] "Gajim - %d uleste meldinger"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d ulest privat melding"
+msgstr[1] "Gajim - %d uleste private meldinger"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "turkis"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "lager logg database"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "for konto %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Kunne ikke laste bilde"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Kunne ikke koble til \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Denne meldingen er kryptert]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Abbonér"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Adresse"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Borte"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Last ned"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Legg til Spesiell Alarm for %s"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Ikke tilgjengelig"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Slett"
+
+#~ msgid "Contact _Info"
+#~ msgstr "Kontakt_Info"
+
+#~ msgid "Contact Information"
+#~ msgstr "Kontaktinformasjon"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Ugyldig rom eller servernavn"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Ukjent D-Bus versjon: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "vCard publisering vellykket"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Din personlige informasjon har blitt publisert uten feil."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Migrerer Logger..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Vennligst vent mens loggene blir migrert..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Bli med i Nytt Rom"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Gjem dette vinduet"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d ulest melding"
+#~ msgstr[1] "Gajim - %d uleste meldinger"
+
+#~ msgid "Since %s"
+#~ msgstr "Siden %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automatisk godkjenn kontakt"
 
diff --git a/po/nl.po b/po/nl.po
index d197e991f..0a6aae145 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,12 +5,12 @@
 # Stéphan Kochen <stephan@kochen.nl>, 2005.
 # 
 # 
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2005-12-19 18:44+0100\n"
 "Last-Translator: Stéphan Kochen <stephan@kochen.nl>\n"
 "Language-Team: none\n"
@@ -21,15 +21,15 @@ msgstr ""
 
 # TODO: Loop alles na, zet zinnen in de goede vorm, volg GNOME NL richtlijnen,
 #       ruim mnemonics op. Zie ook: http://nl.gnome.org/
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "Een GTK+ Jabber client"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr ""
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM Client"
 
@@ -47,16 +47,23 @@ msgid "_Discover Services..."
 msgstr "Ontdek Services..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Groupsgesprek"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Account Be_werken..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Open Email Samensteller"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
 
@@ -110,7 +117,7 @@ msgid "Pass_word:"
 msgstr "_Wachtwoord:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Sla _wachtwoord op"
 
@@ -136,7 +143,7 @@ msgid "Your JID:"
 msgstr "Jouw JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "Gea_vanceerd"
 
@@ -150,7 +157,7 @@ msgid "_Host:"
 msgstr "_Host:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
@@ -183,10 +190,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Overige</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persoonlijke Informatie</b>"
 
@@ -203,6 +212,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Automatisch verbinding herstellen als deze verbroken wordt"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Automatisch _verbinding maken als Gajim opstart"
 
@@ -222,6 +232,7 @@ msgstr ""
 "gebruikt standaard al TLS waar mogelijk. Deze optie schakelt TLS echter uit."
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Kies _Sleutel..."
 
@@ -238,16 +249,16 @@ msgid "Edit Personal Information..."
 msgstr "Wijzig Persoonlijke Informatie..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Algemeen"
 
@@ -270,6 +281,7 @@ msgstr ""
 "stand te houden"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -278,6 +290,7 @@ msgstr ""
 "alleen leesrechten voor allen jou"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -286,6 +299,7 @@ msgstr ""
 "bij het opstarten"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -303,18 +317,23 @@ msgstr "Informatie over jou, zoals op de server opgeslagen"
 msgid "Manage..."
 msgstr "Beheer..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Geen sleutel geselecteerd"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Geen"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Persoonlijke Informatie"
 
@@ -337,14 +356,18 @@ msgstr ""
 "prioriteit wint."
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "_Bron: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -357,41 +380,47 @@ msgstr ""
 "met zowel met een bron 'Thuis' als een bron 'Werk' ingelogd te zijn. De "
 "prioriteit bepaald dan wie berichten ontvangt. (zie hieronder)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Sla _wachtwoord op (onveilig)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Sla gespreks_logboek op voor alle contacten"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Keep-alive-pakketten verzenden"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_roniseer account status met globale status"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Gebruik _SSL (verouderd)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Gebruik aangepaste hostnaam/poort"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 #, fuzzy
 msgid "Use file transfer proxies"
 msgstr "bestandsoverdrachtlijst"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Naam: "
 
@@ -401,63 +430,92 @@ msgstr "Accounts"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Indien aangevinkt en je twee of meer accounts hebt, zal Gajim de contacten "
 "van alle accounts samenvoegen alsof ze een grote account zijn."
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "Accounts _samenvoegen"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "Be_werk"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Verwijder"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Account"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Nieuwe Contact Toevoegen"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Ik wil je graag toevoegen aan mijn contactlijst"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Account"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Groep:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Bijnaam:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protocol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Abonneer"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Re_gistreer"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "Gebruikers ID:"
@@ -547,82 +605,63 @@ msgstr "<b>Geluiden</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Adres"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "Gea_vanceerde Acties"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Geavanceerde Configuratie Wijzigen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Status: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Afwezig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Bezig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Download"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "commando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "<b>Visuele Meldingen</b>"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Niet Beschikbaar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Open voor Gesprek"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Speel _geluiden af"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -635,76 +674,76 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Gebruik enkel gespreksvenster met _tabs"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Poort: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -742,7 +781,7 @@ msgstr "Neem deel aan _Groepsgesprek"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Toevoegen aan Roster"
 
@@ -763,7 +802,8 @@ msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Start Gesprek"
@@ -773,7 +813,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Klik om de gespreksgeschiedenis van deze contact te bekijken"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "_Bestand Verzenden"
 
@@ -789,7 +830,8 @@ msgstr "_Compacte Weergave    Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Geschiedenis"
 
@@ -857,7 +899,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Laat een popup zien als een bestandsoverdracht voltooid is"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Verder"
 
@@ -894,66 +936,61 @@ msgstr ""
 "Vaandel"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Actief"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Vetgedrukt"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Letterstijl:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Gajim Themas Aanpassen"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 #, fuzzy
 msgid "Gone"
 msgstr "Geen"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 #, fuzzy
 msgid "Inactive"
 msgstr "Actief"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Schuingedrukt"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 #, fuzzy
 msgid ""
 "MUC\n"
 "Messages"
 msgstr "_Bericht"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Gepauzeerd"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "Tekst_kleur"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "Letter_type"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Achtergrond:"
 
@@ -1068,7 +1105,7 @@ msgid "Accept"
 msgstr "Accepteer"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Weigeren"
 
@@ -1076,13 +1113,14 @@ msgstr "Weigeren"
 msgid "Invitation Received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Bijnaam:"
 
@@ -1100,13 +1138,8 @@ msgstr "Recent:"
 msgid "Room:"
 msgstr "Ruimte:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Binnengaan"
 
@@ -1133,6 +1166,10 @@ msgstr "Beheer Bladwijzers"
 msgid "Print status:"
 msgstr "Print tijd:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Server:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Titel:"
@@ -1154,7 +1191,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Beheer Proxy Profielen"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Naam:"
 
@@ -1171,20 +1209,21 @@ msgstr "Gebruik aanmelding"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klik om een emoticon in te voegen (Alt+E)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Versleuteling"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Acties"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "Ver_stuur"
 
@@ -1260,19 +1299,26 @@ msgid "Also known as iChat style"
 msgstr "Ook bekend als iChat-stijl"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Vraag om status bericht als ik:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Automatisch _afwezig na:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Automatisch _niet beschikbaar na:"
 
 # deelnemen?
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1284,20 +1330,20 @@ msgstr ""
 "Gebruik altijd standaard KDE toepassingen\n"
 "Aangepast"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid "B_efore nickname:"
 msgstr "Voor bijnaam:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Gesprek"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1307,40 +1353,45 @@ msgstr ""
 "lastigvalt. Wees voorzichtig, met deze optie worden all berichten van "
 "contacten niet op je rooster geblokkeerd"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Statusbericht"
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default status _iconset:"
 msgstr "Standaard _status iconenset:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Statusberichten van contacten weergeven in het rooster"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 #, fuzzy
 msgid "E_very 5 minutes"
 msgstr "Elke 5 _minuten"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Beheer Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Gebeurtenissen"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1348,7 +1399,7 @@ msgid ""
 "send to the other party."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -1356,7 +1407,7 @@ msgstr ""
 "Gajim zal automatisch nieuwe berichten in een nieuw venster of tab in een "
 "bestaand venster laten zien"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -1364,7 +1415,7 @@ msgid ""
 msgstr ""
 "Gajim zal nieuwe berichten mededelen m.b.v. een popup rechtsonder in beeld"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1372,7 +1423,7 @@ msgstr ""
 "Gajim zal contacten die zich aanmelden mededelen m.b.v. een popup "
 "rechtsonder in beeld"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1380,13 +1431,19 @@ msgstr ""
 "Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
 "in beeld"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim zal alleen het contacticoon veranderen bij nieuwe berichten"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -1395,7 +1452,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1404,7 +1461,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim statusberichten van contacten onder de "
 "contactnaam in het roostervenster laten zien."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1412,7 +1469,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim de positie en grootte van vensters onthouden "
 "voor de volgende keer dat ze geopend worden"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1422,7 +1479,7 @@ msgstr ""
 "(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
 "status online, afwezig, bezig, enz...)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -1431,12 +1488,12 @@ msgstr ""
 "Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
 "bijpassende grafische emoticons"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Beheer..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1444,82 +1501,86 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "Bij elk _bericht"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid "One message _window:"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Speel _geluiden af"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Print tijd:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "Sla _positie en grootte op voor rooster- en gespreksvensters"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_Inloggen"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_Uitloggen"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "T_heme:"
 msgstr "Thema:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Het statusbericht voor automatische afwezigheid"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Het statusbericht voor automatisch niet beschikbaar"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Gebruik _transport iconensets"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Icoon in mededelingsgebied"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -1532,160 +1593,169 @@ msgstr ""
 "Nieuwe bericht-gebeurtenissen treden alleen op als het een nieuw bericht is "
 "van een contact waar je nog geen gesprek mee hebt"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Geavanceerde Configuratie Wijzigen"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "_After time:"
 msgstr "Na tijdsstempel:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 #, fuzzy
 msgid "_Before time:"
 msgstr "Voor tijdsstempel:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 #, fuzzy
 msgid "_File manager:"
 msgstr "Bestandsbeheerder:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 #, fuzzy
 msgid "_Font:"
 msgstr "Lettertype:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _markeren"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Binnenkomend bericht:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "Houdt status veranderingen van contacten bij in het logboek"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Nooit"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Stel mij ervan op de hoogte"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "_Open..."
 msgstr "Open..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Uitgaand bericht:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Speler:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Opduiken"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Herstel naar Standaard Kleuren"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 #, fuzzy
 msgid "_Sort contacts by status"
 msgstr "Sorteer contacten op status"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 #, fuzzy
 msgid "_Status message:"
 msgstr "Status bericht:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minuten"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Start Gesprek"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "Automatisch _verbinding maken als Gajim opstart"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Wis MOTD"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 msgid "Privacy List"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Abonnement"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "In de groep"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1693,32 +1763,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Bericht verzenden"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Info"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adres"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Stel Contact_afbeelding in"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Verjaardag:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Stad:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Bedrijf:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Land:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Afdeling:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Extra Adres:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Familie:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Formaat: YYYY-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Voornaam:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Middelste naam:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Meer"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Persoonlijke Informatie"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefoonnummer:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Positie:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Postcode:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Voorvoegsel:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Rol:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Staat:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Straat:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Achtervoegsel:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Werk"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Publiceren"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Haal op"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1738,48 +1948,59 @@ msgid "A_sk to see his/her status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Visuele Meldingen</b>"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Wijs Open_PGP Sleutel toe"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Wijzig _Groepen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Enkel _Bericht Verzenden"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Start _Gesprek"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Verbiedt hem/haar mijn status te zien"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Verwijder van Rooster"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Hernoem"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Abonnement"
 
@@ -1804,42 +2025,53 @@ msgid "Help online"
 msgstr "Hulp online"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Profiel, Contactafbeelding"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transporten"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "_Offline Contacten Weergeven"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Inhoud"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "Ontdek Services"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Voorkeuren"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "A_fsluiten"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Stem"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "Ga"
@@ -1911,22 +2143,18 @@ msgstr ""
 "online ben"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "Contact _Info"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "Geef contact geen toestemming om te zien of je online bent"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Abonneringsverzoek"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Toestemmen"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Weigeren"
 
@@ -1942,164 +2170,51 @@ msgstr "_Rooster Weergeven"
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Info"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adres"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Vraag:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Verjaardag:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Stad:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Client:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Bedrijf:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Contact Informatie"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Land:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Afdeling:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Extra Adres:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Familie:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Formaat: YYYY-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Voornaam:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Homepage:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "_Inhoud"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Locatie"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Middelste naam:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Meer"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "Besturingssysteem:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Telefoonnummer:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Positie:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Postcode:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Voorvoegsel:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Bron:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Rol:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Stel Contact_afbeelding in"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Staat:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Straat:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Abonnement:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Achtervoegsel:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Werk"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "Gespreksgeschiedenis"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Publiceren"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Haal op"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Verkeer</b>"
@@ -2131,30 +2246,165 @@ msgstr "_Bericht"
 msgid "_Presence"
 msgstr "_Aanwezigheid"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Naam:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Naam:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Persoonlijke Informatie"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "Account Be_werken..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Gebruik aangepaste hostnaam/poort"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Voorkeur Naam"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Waarde"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Niets)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Verborgen"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Algemeen"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "groen"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Locatie"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Schuingedrukt"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Publiceren"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2170,54 +2420,65 @@ msgstr ""
 "\n"
 "De markering van spelfouten zal niet worden gebruikt."
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 #, fuzzy
 msgid "Chats"
 msgstr "Gesprek"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr ""
+"%(nickname)s in ruimte %(room_name)s heeft je een nieuw bericht gestuurd."
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s heeft geen OpenPGP sleutel uitgezonden en je hebt er geen toegewezen"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Versleuteling ingeschakeld"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "niet in het rooster"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Je hebt zojuist een nieuw bericht ontvangen van \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2225,281 +2486,328 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Elke %s _minuten"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Actief"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Er is geen verbinding beschikbaar"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "titel statusbericht"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "statusbericht"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Contactnaam"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contact is Ingelogd"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 #, fuzzy
 msgid "Message Sent"
 msgstr "_Bericht"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Een Jabber ID moet in de vorm \"gebruiker@servernaam\" zijn."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Je moet een account aanmaken voordat persoonlijke informatie kan worden "
 "aangepast."
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Zonder verbinding is het niet mogelijk persoonlijke informatie aan te passen."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr ""
+"Je moet een account aanmaken voordat persoonlijke informatie kan worden "
+"aangepast."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Er trad een probleem op bij het ophalen van je geheime OpenPGP sleutels."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Je hebt geen actieve account"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Account naam is al in gebruik"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2509,91 +2817,92 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nieuwe Ruimte"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Groupsgesprek"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Zorg ervoor dat de server- en ruimtevelden ingevuld zijn, of verwijder deze "
 "bladwijzer."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2601,23 +2910,23 @@ msgstr ""
 "Je kunt geavanceerde accountopties instellen door op de Geavanceerd knop te "
 "drukken, of later via Accounts in het Bewerken menu van het hoofdvenster."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2625,472 +2934,521 @@ msgstr ""
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Acties voor \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Zoek op in het _Woordenboek"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "\"%s\" ontbreekt in de URL van het woordenboek en het is geen WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "\"%s\" ontbreekt in de URL van de Web Zoekmachine"
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Gisteren"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagen geleden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python koppeling ontbreekt op deze computer"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus mogelijkheden van Gajim kunnen niet worden gebruikt"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Contactnaam: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Groep"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "In de groep"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "SleutelID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Contactnaam"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusbericht"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Adres:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Adres:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Extra Adres:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vul de informatie van de contactpersoon in die je aan account %s toe wilt "
 "voegen"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vul de informatie in van de contactpersoon die je toe wilt voegen"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporten"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Ongeldige Gebruikers ID"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "Gebruikers ID:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "Een GTK+ jabber client"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr "Stéphan Kochen <stephan@kochen.nl>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abonnerings aanvraag voor account %s van %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnering aangevraagd van %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Je bent al in ruimte %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
 "zijn."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek met account %s"
 
-#: ../src/dialogs.py:1030
+#: ../src/dialogs.py:1184
 #, fuzzy
-msgid "Invalid room or server name"
-msgstr "Ongeldige gebruikersnaam"
+msgid "Invalid room Jabber ID"
+msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+msgid "The room Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Vul de contact ID in van de persoon waaraan het bericht verstuurd moet "
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Contact is Uitgelogd"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Nieuw Bericht"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Nieuw Enkel Bericht"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr ""
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contact is Uitgelogd"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
+msgstr "Enkel Bericht met account %s"
+
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Ontvangen %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "XML Console"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Beschrijving: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Start Gesprek"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Verbinding"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Overigen"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Conferentie"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Zonder verbinding is het niet mogelijk te bladeren door aangebode services"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "De service kon niet worden gevonden"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3098,46 +3456,51 @@ msgstr ""
 "Er bestaat geen service op het opgegeven adres, of de service geeft geen "
 "antwoord. Controleer het adres en probeer nogmaals."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "De service kan niet worden doorbladerd"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Dit soort service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "via account %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Onderzoeken %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Gebruikers"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Beschrijving"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Bestand"
@@ -3155,7 +3518,7 @@ msgstr "Voortgang"
 msgid "Filename: %s"
 msgstr "Bestandsnaam: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Grootte: %s"
@@ -3163,17 +3526,17 @@ msgstr "Grootte: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Jij"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Afzender: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
@@ -3194,79 +3557,89 @@ msgstr "Bestandsoverdracht geannuleerd"
 msgid "Connection with peer cannot be established."
 msgstr "Kon geen verbinding maken met gebruiker."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Ontvanger: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Fout bij lezen bestand:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Bestandsoverdracht gestopt door andere gebruiker"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Kies het Bestand om te Sturen"
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim heeft geen toegang tot dit bestand"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Dit bestand is in gebruik door een ander proces."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Bestand: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wil je een bestand sturen:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Sla Bestand op als..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3274,58 +3647,258 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Ongeldig Bestand"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Bestand: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Afzender: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim vereist een Xserver en zal nu stoppen..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim vereist PyGTK 2.6 of nieuwer"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim vereist PyGTK 2.6 of nieuwer en zal nu stoppen..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim vereist GTK 2.6 of nieuwer"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim vereist GTK 2.6 of nieuwer en zal nu stoppen..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "Libglade ondersteuning ontbreekt in de GTK+ runtime"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Verwijder je GTK+ runtime en installeer de laatste stabiele versie van %s"
+
+#: ../src/gajim.py:65
+#, fuzzy
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Controleer of gtk en pygtk ondersteuning hebben voor libglade op je systeem."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim vereist PySQLite2"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim vereist PySQLite2"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Neem je dit verzoek aan?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Verbinding"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Onderwerp: %s\n"
+
+#: ../src/gajim.py:654
+#, fuzzy, python-format
+msgid "error while sending %s ( %s )"
+msgstr "fout tijdens versturen"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Machtiging geaccepteerd"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Contact \"%s\" heeft je toestemming gegeven zijn status te zien."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Je zult hem altijd als offline zien."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kan geen contact maken met \"%s\""
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Controleer de verbinding of probeer later nogmaals."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s is nu %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Je wachtwoord is incorrect"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
+
+#: ../src/gajim.py:1084
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Je hebt ongelezen berichten"
+msgstr[1] "Je hebt ongelezen berichten"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s wil je een bestand sturen."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Je hebt %(filename)s met succes van %(name)s ontvangen."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Je hebt %(filename)s met succes aan %(name)s gestuurd."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Vul de informatie in voor je nieuwe account</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Kan je instellingen en voorkeuren niet opslaan"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Sessiebeheer ondersteuning is niet beschikbaar (gnome.ui module ontbreekt)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "laat hulp zien voor een specifiek commando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "commando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "laat hulp zien op commando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Laat roostervenster zien of verbergt het"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Laat een venster opduiken met het volgende ongelezen bericht"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3333,46 +3906,46 @@ msgstr ""
 "Drukt een lijst af van contacten in het rooster. Elke contact komt op een "
 "aparte regel"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "geef alleen contacten weer van de gegeven account"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Drukt een lijst van geregistreerde accounts af"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Verander de status van de account of accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "een van: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "bericht"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "statusbericht"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3381,23 +3954,23 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Laat het gespreksvenster zien zodat je berichten kunt versturen aan een "
 "contact"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID van de contact waar je me in gesprek wilt gaan"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "Indien opgegeven zal contact van de contactlijst van deze account gehaald "
 "worden"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3408,28 +3981,28 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "inhoud bericht"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "pgp sleutel"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "indien opgegeven zal het bericht versleuteld worden met deze publieke sleutel"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "indien opgegeven zal het bericht verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3440,111 +4013,111 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Onderwerp:"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "_Bericht"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID van contact"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 #, fuzzy
 msgid "Name of the account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Stuurt een bestand aan contact"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "bestand"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Bestandspad"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "indien opgegeven zal bestand verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Laat alle voorkeuren zien en hun waarden"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Zet waarde van 'sleutel' op 'waarde'."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "sleutel=waarde"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'key' is de naam van de voorkeur, 'waarde' is de waarde die zal worden "
 "ingesteld"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Verwijdert een voorkeur onderdeel"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "sleutel"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "naam van de voorkeur die verwijderd zal worden"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Schrijft de huidige staat van de Gajim voorkeuren weg naar het .config "
 "bestand"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Voegt contact toe aan rooster"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Voegt een nieuwe contact toe aan deze account"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
@@ -3552,25 +4125,40 @@ msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "XML Console"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument \"contact_jid\" ontbreekt"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3579,16 +4167,11 @@ msgstr ""
 "'%s' staat niet op je rooster.\n"
 "Geef een account op om het bericht mee te sturen."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Onbekende D-Bus versie: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3597,16 +4180,16 @@ msgstr ""
 "Gebruik: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Argumenten:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s niet gevonden"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3615,7 +4198,7 @@ msgstr ""
 "Gebruik: %s commando [argumenten]\n"
 "Commando is een van:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3624,333 +4207,138 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim vereist een Xserver en zal nu stoppen..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim vereist PyGTK 2.6 of nieuwer"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim vereist PyGTK 2.6 of nieuwer en zal nu stoppen..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim vereist GTK 2.6 of nieuwer"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim vereist GTK 2.6 of nieuwer en zal nu stoppen..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Libglade ondersteuning ontbreekt in de GTK+ runtime"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Verwijder je GTK+ runtime en installeer de laatste stabiele versie van %s"
-
-#: ../src/gajim.py:65
-#, fuzzy
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Controleer of gtk en pygtk ondersteuning hebben voor libglade op je systeem."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim vereist PySQLite2"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Neem je dit verzoek aan?"
-
-#: ../src/gajim.py:611
-#, fuzzy, python-format
-msgid "error while sending %s ( %s )"
-msgstr "fout tijdens versturen"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Machtiging geaccepteerd"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Contact \"%s\" heeft je toestemming gegeven zijn status te zien."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Je zult hem altijd als offline zien."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kan geen contact maken met \"%s\""
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Controleer de verbinding of probeer later nogmaals."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s is nu %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Je wachtwoord is incorrect"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1035
-#, fuzzy, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Je hebt ongelezen berichten"
-msgstr[1] "Je hebt ongelezen berichten"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s wil je een bestand sturen."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Je hebt %(filename)s met succes van %(name)s ontvangen."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Je hebt %(filename)s met succes aan %(name)s gestuurd."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "vCard publicatie is met succes afgerond"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Je persoonlijke informatie is met succes gepubliceerd."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "vCard publicatie is mislukt"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Er trad een fout up bij het publiceren van je persoonlijke informatie, "
-"probeer het later nogmaals."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Kan je instellingen en voorkeuren niet opslaan"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Sessiebeheer ondersteuning is niet beschikbaar (gnome.ui module ontbreekt)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Logboeken worden omgezet..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Thema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "thema naam"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Je kunt je huidige thema niet verwijderen"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Kies eerst een ander thema."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 #, fuzzy
 msgid "Private Chat"
 msgstr "Start Gesprek"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 #, fuzzy
 msgid "Private Chats"
 msgstr "Start Gesprek"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Je bent niet meer in ruimte \"%s\" of \"%s\" heeft de ruimte verlaten."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 #, fuzzy
 msgid "Group Chats"
 msgstr "Groupsgesprek"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Verander Bij_naam"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Deze ruimte heeft geen onderwerp"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen door %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s is nu bekend als %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s is nu %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Deze ruimte heeft geen onderwerp"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s blijkt geen geldige JID te zijn"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Onbekend commando: /%s (als je deze tekst wil sturen, begin dan met /say)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Commando's: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3963,7 +4351,7 @@ msgstr ""
 "\" bevat. Als de JID zich momenteel in de ruimte bevindt, zal hij eruit "
 "geschopt worden. Ondersteunt GEEN spaties in de bijnaam."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3971,12 +4359,12 @@ msgstr ""
 "Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
 "gebruiker."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3985,12 +4373,12 @@ msgstr ""
 "Gebruik: /%s [reden], sluit de huidige tab of venster, en laat reden achter "
 "indien opgegeven."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3999,7 +4387,7 @@ msgstr ""
 "Gebruik: /%s <JID> [reden], nodigt JID uit de huidige ruimte binnen te "
 "komen, met optioneel de opgegeven reden."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4008,7 +4396,7 @@ msgstr ""
 "Gebruik: /%s <ruimte>@<server>[/bijnaam], biedt aan ruimte@server binnen te "
 "gaan, optioneel met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4019,7 +4407,7 @@ msgstr ""
 "bijnaam van de ruimte, optioneel met de opgegeven reden. Ondersteunt GEEN "
 "spaties in de bijnaam."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -4028,7 +4416,7 @@ msgstr ""
 "Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
 "gebruiken. (bijv. /%s loopt...)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4037,106 +4425,106 @@ msgstr ""
 "Gebruik: /%s <bijnaam> [bericht], opent een privé gespreksvenster en stuurt "
 "bericht naar de gebruiker met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Gebruik: /%s <bijnaam>, verandert je bijnaam in de huidige ruimte."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr ""
 "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
 "onderwerp bij naar de opgegeven tekst."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
 "onderwerp bij naar de opgegeven tekst."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Gebruik: /%s <bericht>, stuurt een bericht zonder naar commando's te zoeken."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Geen hulp beschikbaar voor /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Weet je zeker dat je de ruimte \"%s\" wilt verlaten?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr ""
 "Als je dit venster sluit zal de verbinding verbroken worden met deze ruimte."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Vraag mij dit niet nogmaals"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Bijnaam Veranderen"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Bladwijzer bestaat al"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Ruimte \"%s\" heeft al een bladwijzer."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Je kunt bladwijzers beheren via het Acties menu in je rooster."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Een programmeerfout is ontdekt"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4144,92 +4532,92 @@ msgstr ""
 "Het is waarschijnlijk niet fataal, maar het is een goed idee toch de "
 "ontwikkelaars op de hoogte te stellen."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Rapporteer Fout"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Fout bij verwerken bestand:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Kan niet naar %s schrijven. Sessiebeheer ondersteuning werkt mogelijk niet"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Sla Bestand op als..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "logboek database wordt aangemaakt"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 #, fuzzy
 msgid "Contacts"
 msgstr "_Inhoud"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Datum:"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 #, fuzzy
 msgid "Nickname"
 msgstr "Bijnaam:"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "_Bericht"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 #, fuzzy
 msgid "Subject"
 msgstr "Onderwerp:"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4238,134 +4626,178 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Logboeken worden omgezet..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr ""
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Gespreksgeschiedenis van %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is nu %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 #, fuzzy
 msgid "Messages"
 msgstr "_Bericht"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nieuw Enkel Bericht"
 
-#: ../src/notify.py:150
+#: ../src/notify.py:234
 #, fuzzy, python-format
-msgid "New Private Message from room %s"
+msgid "New Private Message from group chat %s"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr ""
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Uitnodiging Ontvangen"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr ""
+"Het is niet mogelijk je contact informatie te publiceren zonder verbinding."
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "vCard publicatie is mislukt"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Er trad een fout up bij het publiceren van je persoonlijke informatie, "
+"probeer het later nogmaals."
+
+#: ../src/profile_window.py:381
+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/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Je bent al in ruimte %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Je kunt een ruimte niet binnengaan terwijl je onzichtbaar bent"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "aan %s account"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "via %s account"
@@ -4373,42 +4805,53 @@ msgstr "via %s account"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "via account %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Beheer Bladwijzers..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "voor account %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 #, fuzzy
 msgid "History Manager"
 msgstr "_Geschiedenis"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "Nieuwe Ruimte _Binnengaan"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Neem deel aan Groepsgesprek"
+
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1259
+msgid "You must read them before removing this transport."
+msgstr ""
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4416,67 +4859,86 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Transport \"%s\" zal worden verwijderd"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
+"contacten via deze transport"
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Nieuwe Ruimte"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Ik zou je graag aan mijn rooster toe willen voegen"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Her_noem"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Log in"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "Log _uit"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Wijzig Statusbericht"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -4485,7 +4947,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:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4493,37 +4955,52 @@ 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:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
+"status te zien. Hij/Zij zal jou altijd als offline zien."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, 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:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Sla wachtwoord op"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4532,21 +5009,22 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 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:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Je hebt ongelezen berichten"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4554,145 +5032,111 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Van %s in ruimte %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Stuurt een bestand aan contact"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Wijzig Statusbericht..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Verberg dit menu"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - één ongelezen bericht"
-msgstr[1] "Gajim - %d ongelezen berichten"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - één ongelezen bericht"
-msgstr[1] "Gajim - %d ongelezen berichten"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - één los ongelezen bericht"
-msgstr[1] "Gajim - %d ongelezen losse berichten"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - één ongelezen groepgesprek bericht"
-msgstr[1] "Gajim - %d ongelezen groepgesprek berichten"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - één ongelezen privé bericht"
-msgstr[1] "Gajim - %d ongelezen privé berichten"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Rol: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Aansluiting: "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Bron: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Status: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:484
 #, fuzzy, python-format
-msgid "Last status on %s"
+msgid "Last status: %s"
 msgstr "Standaard _status iconenset:"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:486
 #, fuzzy, python-format
-msgid "Since %s"
-msgstr "Grootte: %s"
+msgid " since %s"
+msgstr "Doorbladeren van %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Verzonden: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Afgerond"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Vastgelopen"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Verzenden"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Deze service heeft nog niet geantwoord met gedetaileerde informatie"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4700,25 +5144,25 @@ msgstr ""
 "Deze service kon niet antwoorde met gedetaileerde informatie.\n"
 "Het is waarschijnlijk veroudert of kapot"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr ""
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Aansluiting: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4726,7 +5170,7 @@ msgstr ""
 "Deze contact is geïnteresseert in jou aanwezigheid, maar jij niet in zijn/"
 "haar aanwezigheid"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4734,43 +5178,28 @@ msgstr ""
 "Je bent geïnteresseert in de contact z'n aanwezigheid, maar hij/zij niet in "
 "jouw aanwezigheid"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 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:338
+#: ../src/vcard.py:271
 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:347
+#: ../src/vcard.py:279
 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:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " bron met prioriteit"
 
-#: ../src/vcard.py:458
-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:491
-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:495
-#, fuzzy
-msgid "Personal details"
-msgstr "Persoonlijke Informatie"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "logboek database wordt aangemaakt"
 
@@ -4795,91 +5224,89 @@ msgstr "%s is een map, maar een bestand werd verwacht"
 msgid "creating %s directory"
 msgstr "map %s wordt aangemaakt"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Service niet beschikbaar: Gajim is niet open of remote_control staat uit"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus bevindt zich niet op deze machine of de python module ontbreekt"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Gebruik DBus en Notification-Daemon om notificaties weer te geven"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tijd in minuten waarna je statusbericht op afwezig ingesteld wordt"
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Afwezig vanwege inactiviteit"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Tijd in minuten waarna je statusbericht op niet beschikbaar ingesteld wordt."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Niet beschikbaar vanwege inactiviteit"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Indien Aan, verwijder niet */_ . Zodat *abc* vetgedrukt wordt, maar zonder "
 "dat * * verwijdert wordt."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Voeg * en [n] toe aan roster titel?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4887,12 +5314,12 @@ msgstr ""
 "Hoeveel regels te onthouden van het vorige gesprek zodra een gesprekstab of -"
 "venster heropend wordt."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hoeveel minuten zouden regels van het vorige gesprek onthouden moeten worden."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4900,11 +5327,11 @@ msgstr ""
 "Stuur bericht na Ctrl+Enter en slechts Enter maakt een nieuwe regel "
 "(Standaard gedrag van Mirabilis ICQ)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hoeveel regels op te slaan voor Ctrl+Omhoog"
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4913,22 +5340,22 @@ msgstr ""
 "Óf een aangepaste url met %s erin verwerkt, waar %s is een woord/zin, óf "
 "'WIKTIONARY' wat betekent dat wiktionary gebruikt zal worden."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Indien aangevinkt zal Gajim bestuurd kunnen worden met gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
@@ -4936,7 +5363,7 @@ msgid ""
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
@@ -4944,7 +5371,7 @@ msgid ""
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4952,24 +5379,24 @@ msgstr ""
 "Forceert de host die opgegeven wordt voor bestandsoverdrachten in het geval "
 "van een NAT of port forwarding."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Volgens de IEC standaard is 1 KiB = 1024 bytes, 1 KB = 1000 bytes."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Laat tabs zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Laat tab rand zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Laat sluit knop zien in tabs?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4977,7 +5404,7 @@ msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die oplichten in een "
 "groepsgesprek"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4985,11 +5412,11 @@ msgstr ""
 "Indien Aan stopt Gajim zodra het venster gesloten wordt. Deze instelling is "
 "alleen geldig als het icoon in het notificatiegebied gebruikt wordt."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Indien Aan registreerd Gajim xmpp:// bij elke start."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4997,15 +5424,16 @@ msgstr ""
 "Indien Aan zal Gajim een icoon op elke tab weergeven met ongelezen "
 "berichten. Afhankelijk van het thema kan dit icoon geanimeerd zijn."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Indien Aan zal Gajim het statusbericht van contacten weergeven onder hun "
 "naam in het roostervenster, indien deze niet leeg is"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -5013,7 +5441,7 @@ msgstr ""
 "Indien Aan zal Gajim contactafbeeldingen ophalen voor elk contact waarvan "
 "geen bekend is, of de laatste afbeelding te oud is."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5022,34 +5450,43 @@ msgstr ""
 "Indien Uit zullen geen statusberichten weergeven worden in gesprekken "
 "wanneer een contact zijn/haar status aanpassen."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5057,117 +5494,178 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:207
 #, fuzzy
-msgid "Hides the buttons in group chat window"
+msgid "Hides the buttons in group chat window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr ""
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr ""
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP is niet bruikbaar op deze computer"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Eten"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Ik ben aan het eten, laat een bericht achter."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Werken"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Uit"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Ik ben uit van het leven genieten"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Aanwezig"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Open voor Gesprek"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Niet Beschikbaar"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5175,7 +5673,7 @@ msgstr ""
 "Geluid om af te spelen wanneer een MUC bericht je bijnaam of een van de "
 "woorden in much_highlight_words bevat."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5183,99 +5681,212 @@ msgstr ""
 "Geluid om af te spelen bij elk MUC bericht. (Deze instelling is alleen "
 "geldig als notify_on_all_muc_messages aan staat)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "groen"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "kruidenier"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "menselijk"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Niet in staat de ruimte binnen te gaan"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Wachtwoord"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Transport %s heeft niet op tijd geantwoord met registratie informatie"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Bijnaam niet gevonden: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Niet in staat de ruimte binnen te gaan"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Je bent uit deze ruimte verbannen."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Die ruimte bestaat niet."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "Ruimte creatie is beperkt."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Je geregistreerde bijnaam moet gebruikt worden."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Je staat niet in de ledenlijst"
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"De gewenste bijnaam is in gebruikt of geregistreerd door een andere "
+"gebruiker.\n"
+"Geef een andere bijnaam op:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "we zijn nu op %s geabonneert"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "afmelding verzocht van %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "we zijn nu van %s afgemeld"
+
+#: ../src/common/connection_handlers.py:1776
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Jid %s is niet in lijn met de RFC. Het zal niet toegevoegd worden aan jouw "
+"rooster. Gebruik een roostermanagement applicatie zoals http://jru."
+"jabberstudio.org/ om het te verwijderen"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Om verdere berichten te versturen en ontvangen, moet je de verbinding "
 "opnieuw in stand brengen."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Verbonden met server %s:%s met %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Controleer je verbinding of probeer later nogmaals"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggen mislukt met \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP wachtwoord niet opgegeven"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Je zult verbonden worden met %s zonder OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "onzichtbaar"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Ik ben %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5284,301 +5895,557 @@ msgstr ""
 "Onderwerp: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python koppeling ontbreekt op deze computer"
+
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus mogelijkheden van Gajim kunnen niet worden gebruikt"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Service niet beschikbaar: Gajim is niet open of remote_control staat uit"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus bevindt zich niet op deze machine of de python module ontbreekt"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Niet in staat de ruimte binnen te gaan"
+msgid "one"
+msgstr "Geen"
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Transport %s heeft niet op tijd geantwoord met registratie informatie"
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr ""
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Niet in staat de ruimte binnen te gaan"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Straat:"
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Poort: "
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Je bent uit deze ruimte verbannen."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "bestand"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Die ruimte bestaat niet."
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "Ruimte creatie is beperkt."
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Gebeurtenis"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Je geregistreerde bijnaam moet gebruikt worden."
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Je staat niet in de ledenlijst"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Verder"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
 msgstr ""
-"De gewenste bijnaam is in gebruikt of geregistreerd door een andere "
-"gebruiker.\n"
-"Geef een andere bijnaam op:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "we zijn nu op %s geabonneert"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Wis MOTD"
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "afmelding verzocht van %s"
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "we zijn nu van %s afgemeld"
+msgid "%0 o'clock"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
 msgstr ""
-"Jid %s is niet in lijn met de RFC. Het zal niet toegevoegd worden aan jouw "
-"rooster. Gebruik een roostermanagement applicatie zoals http://jru."
-"jabberstudio.org/ om het te verwijderen"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Registreer met %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Werken"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Geen"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Gebeurtenis"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Ongeldig character in gebruikersnaam."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Server adres vereist."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Ongeldig character in hostnaam."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Ongeldig character in bron."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Bezig"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Bezig"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Niet Beschikbaar"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Niet Beschikbaar"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "Open voor _Gesprek"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Open voor Gesprek"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Aanwezig"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Aanwezig"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "Af_wezig"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Afwezig"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "Onz_ichtbaar"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Onbekend"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Heeft fouten"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Geen"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Aan"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Van"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Geen"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Beheerders"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Beheerder"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Deelnemers"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Deelnemer"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Bezoekers"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Bezoeker"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Role:Geen"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Eigenaar"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrator"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Lid"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "let op deze conversatie"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "is met iets anders bezig"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "is een bericht aan het typen..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "pauzeert tijdens het typen van een bericht"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tab gesloten"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - één ongelezen bericht"
+msgstr[1] "Gajim - %d ongelezen berichten"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - één los ongelezen bericht"
+msgstr[1] "Gajim - %d ongelezen losse berichten"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - één ongelezen groepgesprek bericht"
+msgstr[1] "Gajim - %d ongelezen groepgesprek berichten"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - één ongelezen privé bericht"
+msgstr[1] "Gajim - %d ongelezen privé berichten"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fout: kan %s niet voor lezen openen"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr ""
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "cyaan"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "logboek database wordt aangemaakt"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "voor account %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+msgid "Could not start local service"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Kon geen verbinding maken met \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Dit bericht is versleuteld]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Abonneer"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Adres"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Afwezig"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Download"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "<b>Visuele Meldingen</b>"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Niet Beschikbaar"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Wis MOTD"
+
+#~ msgid "Contact _Info"
+#~ msgstr "Contact _Info"
+
+#~ msgid "Contact Information"
+#~ msgstr "Contact Informatie"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#, fuzzy
+#~ msgid "Invalid room or server name"
+#~ msgstr "Ongeldige gebruikersnaam"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Onbekende D-Bus versie: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "vCard publicatie is met succes afgerond"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Je persoonlijke informatie is met succes gepubliceerd."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Logboeken worden omgezet..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "Nieuwe Ruimte _Binnengaan"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Verberg dit menu"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - één ongelezen bericht"
+#~ msgstr[1] "Gajim - %d ongelezen berichten"
+
+#, fuzzy
+#~ msgid "Since %s"
+#~ msgstr "Grootte: %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automatisch contacten toestemming geven"
 
@@ -5639,10 +6506,6 @@ msgstr "cyaan"
 #~ msgid "Send"
 #~ msgstr "Verzend"
 
-#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-#~ msgstr ""
-#~ "%(nickname)s in ruimte %(room_name)s heeft je een nieuw bericht gestuurd."
-
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s heeft je een nieuw bericht gestuurd."
 
diff --git a/po/no.po b/po/no.po
index b433a1024..a9d4f570d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2,12 +2,12 @@
 # This file is distributed under the same license as the Gajim package.
 # Stian B. Barmen <stian@jabber.no>, 2005.
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-04-26 00:29+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -17,15 +17,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Bookmarks: -1,775,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Gajim Instant Messenger"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
@@ -42,16 +42,23 @@ msgid "_Discover Services..."
 msgstr "_Oppdag Tjenester..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Gruppe Samtale"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Åpne ny Epost"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
 
@@ -105,7 +112,7 @@ msgid "Pass_word:"
 msgstr "Pass_ord:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
@@ -130,7 +137,7 @@ msgid "Your JID:"
 msgstr "Din JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Avansert"
 
@@ -144,7 +151,7 @@ msgid "_Host:"
 msgstr "_Maskin:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Passord:"
 
@@ -176,10 +183,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Informasjon</b>"
 
@@ -196,6 +205,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Koble til på nytt automatisk når kontakten mistes"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "K_oble til når Gajim starter"
 
@@ -216,6 +226,7 @@ msgstr ""
 "deaktivert."
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Velg _Nøkkel..."
 
@@ -232,16 +243,16 @@ msgid "Edit Personal Information..."
 msgstr "Rediger Personlig Informasjon..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Generelle"
 
@@ -267,6 +278,7 @@ msgstr ""
 "frakobling på grunn av inaktivitet"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -275,6 +287,7 @@ msgstr ""
 "bare for deg"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -283,6 +296,7 @@ msgstr ""
 "ved oppstart"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -299,18 +313,23 @@ msgstr "Informasjon om deg, slik som den er lagret på serveren"
 msgid "Manage..."
 msgstr "Behandle..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Ingen"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
@@ -333,14 +352,18 @@ msgstr ""
 "Klienten med den høyeste prioriteten vil få hendelsen"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Ressu_rs:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -354,40 +377,46 @@ msgstr ""
 "navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
 "hendelsene. (se under)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Lagre _passord setning (usikkert)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Bruk _SSL (gammel)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Bruk filoverførings proxier"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Navn:"
 
@@ -397,63 +426,92 @@ msgstr "Kontoer"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste alle "
 "kontakter som om du hadde en konto"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Slå sammen kontoer"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Endre"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Fjern"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Konto"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Legg til ny Kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Konto"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Gruppe:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Kallenavn:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protokoll:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Abbonér"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Re_gistrer"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "Bruker ID:"
@@ -544,82 +602,63 @@ msgstr "<b>Lyder</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Adresse"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "Av_anserte Handlinger"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Status: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Borte"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Opptatt"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Last ned"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "kommando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Legg til Spesiell Alarm for %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Ledig for Prat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -632,75 +671,75 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Gjemmer knappene i gruppe samtale vindu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Bruk et enkelt samtalevindu med _faner"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Port:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -735,7 +774,7 @@ msgstr "Bli med i _Gruppe Samtale"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
@@ -756,7 +795,8 @@ msgid "_Open Link in Browser"
 msgstr "_Åpne Link i Nettleser"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Start Samtale"
@@ -766,7 +806,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Klikk for å se tidligere samtaler med denne kontakten"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Send _Fil"
 
@@ -782,7 +823,8 @@ msgstr "_Kompakt Utseende    Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historie"
 
@@ -846,7 +888,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -883,39 +925,34 @@ msgstr ""
 "Fane"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Fet"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Skriver"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Font stil:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Gajim Tema Valg"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Borte"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -923,7 +960,7 @@ msgstr ""
 "MUC\n"
 "Meldinger"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -931,19 +968,19 @@ msgstr ""
 "MUC Sendte\n"
 "Meldinger"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Pauset"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "Tekst _farge:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "Tekst _font:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Bakgrunn:"
 
@@ -1062,7 +1099,7 @@ msgid "Accept"
 msgstr "Godkjenn"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Nekt"
 
@@ -1070,13 +1107,14 @@ msgstr "Nekt"
 msgid "Invitation Received"
 msgstr "Invitasjon motatt"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
@@ -1094,13 +1132,8 @@ msgstr "Nylig:"
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1125,6 +1158,10 @@ msgstr "Behandle Bokmerker"
 msgid "Print status:"
 msgstr "Utskrifts tid:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Server:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Tittel:"
@@ -1146,7 +1183,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Navn:"
 
@@ -1162,20 +1200,21 @@ msgstr "Bruk autentisering"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikk for å sette inn et uttrykksikon (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Kryptering"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Handlinger"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Send"
 
@@ -1249,18 +1288,25 @@ msgid "Also known as iChat style"
 msgstr "Også kjent som iChat stil"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Auto _borte etter:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Auto _ikke tilgjengelig etter:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1272,19 +1318,19 @@ msgstr ""
 "Alltid bruk KDE standard applikasjoner\n"
 "Egendefinert"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "F_ør kallenavn:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Samtale"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Samtale status opp_lysninger:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1294,35 +1340,40 @@ msgstr ""
 "Bruk med varsomhet, fordi det blokkerer alle meldinger fra lle kontakter som "
 "ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Status Melding"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "Standard status _ikonsamling:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "H_vert 5 minutt"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Uttrykksikoner:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1332,21 +1383,21 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Gajim vil autmatisk vise deg den nye hendelser ved å sprette opp det "
 "relative vinduet"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
 msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1354,7 +1405,7 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget inn"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1362,13 +1413,19 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget ut"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim vil bare endre ikonet til kontakten som har sendt den nye hendelsen"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1376,7 +1433,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1384,7 +1441,7 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1392,7 +1449,7 @@ msgstr ""
 "Dersom valgt vil Gajim huske kontaktliste og samtalevindu posisjoner på "
 "skjermen, samt størrelsen på de til neste gang du åpner de"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1401,7 +1458,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
 "vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1409,11 +1466,11 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1425,80 +1482,84 @@ msgstr ""
 "Per konto\n"
 "Per type"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Alarmer meg om kontakter som:"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Alarmer meg on nye _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "På hver _melding"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "En melding _vindu:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Utskrifts tid:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "Lagre _posisjon og størrelse for kontaktliste og samtalevinduer"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Den automatiserte borte meldinen"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Den autmatiserte ikke tilgjengelig meldingen"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Bruk _transportenes ikoner"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1510,151 +1571,160 @@ msgstr ""
 "melding hendelser vil bare skje dersom du får en ny melding fra en kontakt "
 "du ikke er i samtale med."
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Når en ny hendelse blir motatt"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "_Etter tid:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "_Før tid:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Font:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "_Innkommende melding:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Aldri"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Gi meg beskjed om det"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "_Utgående melding:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Spiller:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Sprett opp"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "_Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minutter"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Private Samtaler"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "K_oble til når Gajim starter"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Slett"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Listen over Utestengte"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Abonement"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "I gruppen"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1662,32 +1732,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Send melding"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Forespør hans/hennes status"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Om"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adresse"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Velg _Avatar"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Fødselsdag:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "By:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Bedrift:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Land:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Avdeling:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Post:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Ekstra Adresse:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Etternavn:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: YYYY-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Fornavn:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Hjemmeside:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Mellomnavn:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Mer"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Personlig Informasjon"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefon Nummer:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Plassering:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Post Kode:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Tittel:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Rolle:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Fylke:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Gate:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Suffix:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Jobb"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Publisér"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Hent"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1707,47 +1917,58 @@ msgid "A_sk to see his/her status"
 msgstr "Forespør hans/hennes status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Legg til Spesiell _Alarm"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Tilegn Open_PGP Nøkkel"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Send _Melding"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Forby han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Abonement"
 
@@ -1772,42 +1993,53 @@ msgid "Help online"
 msgstr "Hjelp online"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Profil, Bilde"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transporter"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Instillinger"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Avslutt"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Stemme"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "G_å"
@@ -1877,22 +2109,18 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Godkjenn kontakt så han kan vite når du er tilkoblet"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "Kontakt_Info"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "Avslå godkjenning fra kontakt så han ikke kan se når du er tilkoblet"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Abbonerings Forespørsel"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Godkjenn"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Nekt"
 
@@ -1908,164 +2136,51 @@ msgstr "Vis _Kontaktliste"
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Om"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adresse"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Spør:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Fødselsdag:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "By:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Bedrift:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Kontaktinformasjon"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Land:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Avdeling:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "E-Post:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Ekstra Adresse:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Etternavn:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: YYYY-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Fornavn:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Hjemmeside:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakter"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Plassering"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Mellomnavn:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Mer"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Telefon Nummer:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Plassering:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Post Kode:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Tittel:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ressurs:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Rolle:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Velg _Avatar"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Fylke:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Gate:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Abbonement:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Suffix:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Jobb"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Publisér"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Hent"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafikk</b>"
@@ -2097,30 +2212,165 @@ msgstr "_Melding"
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Navn:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Navn:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Personlige detaljer"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Rediger Konto..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Bruk egendefinert maskinnavn/port"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Skrive"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Ingen)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Gjemt"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Generelle"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "grønn"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Plassering"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Kursiv"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Publisér"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2136,52 +2386,62 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Samtaler"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s: %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s har ikke publisert en OpenPGP nøkkel og du har ikke tilegnet en"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "ikke i kontaktliste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2189,80 +2449,96 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Hvert %s _minutt"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Tilkobling ikke tilgjengelig"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Neste Melding Motatt"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2270,146 +2546,175 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 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:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "Du må lage en konto før du kan redigere din personlige informasjon."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Du har ingen aktiv konto"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Konto Navnet er Allerede i Bruk"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2417,11 +2722,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2429,11 +2734,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2441,11 +2746,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2453,7 +2758,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2469,87 +2774,88 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nytt Rom"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Gruppe Samtale"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Duplikat Jabber ID"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Kontakten er allerede konfigurert i Gajim."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2558,23 +2864,23 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Det skjedde en feil ved oppretting av kontoen"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2582,464 +2888,515 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
 "i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python bindinger mangler på denne maskinen"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens navn: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Adresse:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Adresse:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Ekstra Adresse:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "Bruker ID:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Sist men ikke minst ønsker vi å takke alle de som lager installasjonspakker."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abbnerings ønske for konto %s fra %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abbonerings ønske fra %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Du er allerede i rom %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Ugyldig rom eller servernavn"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Ugyldig Jabber ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Rom navnet eller server navnet inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Fyll kontakt ID til den kontakten du ønsker\n"
 "å sende en melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Tilbkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Kontakt Logget Av"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
+msgstr "Enslig Melding med konto %s"
+
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
 msgstr "Enslig Melding med konto %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Beskrivelse: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Private Samtaler"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s har invitert deg til %(room_jid)s rom"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Tilkobling"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3047,46 +3404,51 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Utforsk %s med %s kontoen"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanner %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Beskrivelse"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Fil"
@@ -3104,7 +3466,7 @@ msgstr "Fremdrift"
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %s"
@@ -3112,17 +3474,17 @@ msgstr "Størrelse: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Mottaker: "
 
@@ -3143,78 +3505,88 @@ msgstr "Fil overføring avbrutt"
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen kan ikke opprettes."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Mottaker: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Feil under lesing av fil:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Fil overføringen ble stoppet av kontakten på den andre siden"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3222,58 +3594,257 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim trenger en Xserver for å kjøre. Avslutter..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim trenger PyGTK 2.6 eller høyere"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim tenger PyGTK 2.6 eller høyere for å kjøre. Avslutter..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim trenger GTK 2.6 eller høyere"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim trenger GTK 2.6 eller høyere for å kjøre. Avslutter..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ mangler libglade støtte"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
+"versjon fra %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim trenger PySQLite2 for å kjøre"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim trenger PySQLite2 for å kjøre"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autentisering for %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Godtar du denne forespørselen?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Tilkobling"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Tittel: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "feil ved sending %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Godkjenningsforespørel akseptert"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakten \"%s\" fjernet abbonementet fra deg"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Du vil alltid se han eller henne som frakoblet."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt med \"%s\" kan ikke opprettes"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s er nå %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Passord setningen din er ikke riktig"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Ny E-post på %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Du har %d ny E-post melding"
+msgstr[1] "Du har %d nye E-post meldinger"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s ønsker å sende deg en fil."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Du har vellykket sendt %(filename)s til %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Vennligst fyll in data for din nye konto</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Kan ikke lagre dine instillinger og valg"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Aktiver nytt vindu med den neste uleste melingen"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3281,48 +3852,48 @@ msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "melding"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3330,19 +3901,19 @@ msgstr ""
 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
 "til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3353,28 +3924,28 @@ msgstr ""
 "konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP "
 "nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3385,129 +3956,144 @@ msgstr ""
 "konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP "
 "nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Tittel"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Melding Sendt"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Viser alle instillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på instillingen, 'verdi' er gjeldende instilling"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Sletter en instilling"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "navnet på instillingen som skal slettes"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim instillinger til .config filen"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Legger til ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer instillinger (globale instillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Returnerer gjeldende status melding (den globale om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Start samtale med konto %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "XML Konsoll"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3516,16 +4102,11 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Venligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Ukjent D-Bus versjon: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3534,16 +4115,16 @@ msgstr ""
 "Bruk: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3552,7 +4133,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3561,330 +4142,136 @@ msgstr ""
 "Argumenteet \"%s\" er ikke spesifisert. \n"
 "Skriv \"%s hjelp %s\" for mer informasjon"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim trenger en Xserver for å kjøre. Avslutter..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim trenger PyGTK 2.6 eller høyere"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim tenger PyGTK 2.6 eller høyere for å kjøre. Avslutter..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim trenger GTK 2.6 eller høyere"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim trenger GTK 2.6 eller høyere for å kjøre. Avslutter..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ mangler libglade støtte"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
-"versjon fra %s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim trenger PySQLite2 for å kjøre"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autentisering for %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Godtar du denne forespørselen?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "feil ved sending %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Godkjenningsforespørel akseptert"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakten \"%s\" fjernet abbonementet fra deg"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Du vil alltid se han eller henne som frakoblet."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt med \"%s\" kan ikke opprettes"
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s er nå %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Passord setningen din er ikke riktig"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Ny E-post på %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Du har %d ny E-post melding"
-msgstr[1] "Du har %d nye E-post meldinger"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s ønsker å sende deg en fil."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Du har vellykket sendt %(filename)s til %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "vCard publisering vellykket"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Din personlige informasjon har blitt publisert uten feil."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "vCard publisering feilet"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Det skjedde en feil med publisering av din personlige informasjon, prøv "
-"igjen senere."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Kan ikke lagre dine instillinger og valg"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Migrerer Logger..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Vennligst vent mens loggene blir migrert..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "tema navn"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette ditt gjeldene tema"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Privat Samtale"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Du er ikke lenger i rommet \"%s\" eller \"%s\" har dratt."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Gruppe Samtale"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Endre _Kallenavn"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Dette rommet har ingen tittel"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s er nå %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Dette rommet har ingen tittel"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ser ikke ut til å være en gyldig JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Ingen slik kommando: /%s (dersom du ønsker å sende dette, så skriv /say før "
 "teksten)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3897,7 +4284,7 @@ msgstr ""
 "\". Skulle en bruker med den JIDen være tilstede i rommet vil denne også bli "
 "kastet ut. Det støttes ikke med mellomrom i kallenavnet."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3905,12 +4292,12 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den "
 "spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3919,12 +4306,12 @@ msgstr ""
 "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
 "dersom spesifisert."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Bruk: /%s, gjemmer samtale knappene."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3933,7 +4320,7 @@ msgstr ""
 "Bruksanvisning: /%s <JID> [årsak], inviterer JID til gjeldende rom, og viser "
 "en årsak dersom spesifisert."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -3942,7 +4329,7 @@ msgstr ""
 "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
 "gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3953,7 +4340,7 @@ msgstr ""
 "kallenavn fra rommet og viser om spesifisert en årsak. Støtter ikke "
 "mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -3962,7 +4349,7 @@ msgstr ""
 "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
 "tredje person. (f.eks. /%s eksploderer.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -3971,25 +4358,25 @@ msgstr ""
 "Bruk: /%s <kallenavn> [melding], åpner et privat meldingsvindu og sender "
 "meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende rom."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer gjeldende rom tittel."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer gjeldende rom tittel."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -3997,78 +4384,78 @@ msgstr ""
 "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
 "kommandoer."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av rommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Dersom du lukker dette vinduet, så vil du bli koblet fra dette rommet."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Rommet \"%s\" er allerede i dine bokmerker."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Utvis %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "En programmerings feil har blitt detektert"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4076,87 +4463,87 @@ msgstr ""
 "Det er sannynligvis ikke kritisk, men bør rapporteres til utviklerene "
 "likevel."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Rapporter Feil"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Feil under traversering av fil:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Kunne ikke skrive til %s. Sesjons Håndterings støtte vil ikke virke."
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Lagre Fil som..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Melding"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Tittel"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Ønsker du å rengjøre databasen? (STERKT FRARÅDET MENS GAJIM KJØRER)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4170,131 +4557,173 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "hvem"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Ønsker du virkelig å slette loggene til den valgte kontakten?"
 msgstr[1] "Ønsker du virkelig å slette loggene fra de valgte kontaktene?"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s er nå %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Melding fra rom %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Kunne ikke laste bilde"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Invitasjon motatt"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "vCard publisering feilet"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Det skjedde en feil med publisering av din personlige informasjon, prøv "
+"igjen senere."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Uten en tilkobling kan du ikke hente din kontakt informasjon."
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observerere"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Du er allerede i rom %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
@@ -4302,41 +4731,53 @@ msgstr "på %s kontoen"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Behandle Bokmerker..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Bli med i Nytt Rom"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Du har uleste meldinger"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4344,69 +4785,88 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
 "transporten."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Transport \"%s\" vil bli fjernet"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
+"transporten."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Nytt Rom"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Logg på"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4414,7 +4874,7 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han "
 "eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4422,36 +4882,51 @@ 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:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han "
+"eller henne alltid vil se deg som frakoblet."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4459,19 +4934,20 @@ 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:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 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:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Du har uleste meldinger"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4479,145 +4955,111 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Tøm %s i samtalerom %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Gjem dette vinduet"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d ulest melding"
-msgstr[1] "Gajim - %d uleste meldinger"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d ulest melding"
-msgstr[1] "Gajim - %d uleste meldinger"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d ulest melding"
-msgstr[1] "Gajim - %d uleste meldinger"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d ulest melding"
-msgstr[1] "Gajim - %d uleste meldinger"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d ulest privat melding"
-msgstr[1] "Gajim - %d uleste private meldinger"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Rolle: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Tilhørighet: "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Status: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Abbonement: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Siste status på %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Siden %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "siden %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Komplett"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4625,25 +5067,25 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Kunne ikke laste bilde"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Tilhørighet: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4651,7 +5093,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4659,13 +5101,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 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:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4673,27 +5115,15 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 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:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: ../src/vcard.py:458
-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:491
-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:495
-msgid "Personal details"
-msgstr "Personlige detaljer"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "lager logg database"
 
@@ -4718,94 +5148,88 @@ msgstr "%s er en katalog men skulle vært en fil"
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-"pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt "
-"til False"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus finnes ikke på denne maskinen eller python modulen mangler"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Sesjons bussen er ikke tilgjengelig.\n"
-"Prøv å les http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Bruk DBus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før status endres til borte."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Borte på grunn av inaktivitet"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før status endres til ikke tilgjengelig."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Ikke tilgjengelig på grunn av inaktivitet"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formatterings symboler."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli "
 "fjernet."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4813,12 +5237,12 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4826,11 +5250,11 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4839,21 +5263,21 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4861,7 +5285,7 @@ msgstr ""
 "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4869,7 +5293,7 @@ msgstr ""
 "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4877,30 +5301,30 @@ msgstr ""
 "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
 "adresse oversetting/port videresending."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis fane felt ved bare en aktiv samtale?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtale."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4908,11 +5332,11 @@ msgstr ""
 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
 "på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Dersom True vil Gajim registreres for xmpp:// ved hver oppstart."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4920,15 +5344,16 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4936,7 +5361,7 @@ msgstr ""
 "Dersom True vil Gajim spør etter ikonbilde for hver kontakt som ikke hadde "
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4945,20 +5370,29 @@ msgstr ""
 "Dersom False vil du ikke lenge kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4968,17 +5402,19 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 liker ikke sha informasjon når man går inn i et passord beskyttet "
 "samtalerom. Sett dette valget til False for å slutte å sende sha informasjon "
 "til gruppesamtaler"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4986,7 +5422,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Kontrollerer vinduet hvor nye meldinger skal plasseres.\n"
 "'alltid' - Alle meldinger sendes til ett vindu.\n"
@@ -4996,52 +5432,67 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Dersom True vil man kunne lukke fane/vindu med escape knappen"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Gjemmer knappene i gruppe samtale vindu"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Gjemmer knappene i to personers samtale vindu"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5049,59 +5500,106 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Tilgjengelig"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Ledig for Prat"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Ikke tilgjengelig"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5109,7 +5607,7 @@ msgstr ""
 "Lyd som spilles når en MUC melding inneholder et av ordene i "
 "muc_highlight_words, eller når en MUC melding inneholder ditt kallenavn."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5117,96 +5615,209 @@ msgstr ""
 "Lyd som spilles når en ny MUC melding kommer. (Denne instillingen er kun "
 "aktiv når notify_on_all_muc_messages er True)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Feil Passordsetning"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Kallenavn ikke funnet: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Et passord kreves for å bli med i dette samtalerommet."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Du er uønsket i dette rommet."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Et slikt rom finnes ikke."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "Rom oppretting er begrenset."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Ditt registrerte kallenavn må bli brukt. "
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Du er ikke medlems listen."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
+"samtalebruker.\n"
+"Vennligst skriv et annet kallenavn under:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Jeg vil legge deg til min kontaktliste."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "vi abbonerer nå på %s"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "frakoblings ønske fra %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "vi abbonerer ikke lenger på %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Jid %s er ikke RFC kompatilbel. Den vil ikke bli lagt til kontaktlisten. "
+"Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ "
+"for å fjerne den"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "For å sende og motta meldinger må du koble til på nytt."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Transporten %s svarte feil på registrerings forespørselen."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Tilkoblet til server %s:%s med %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilbkoblet til %s uten OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "usynlig"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Jeg er %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5215,301 +5826,561 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Jeg vil legge deg til min kontaktliste."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python bindinger mangler på denne maskinen"
+
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
+"pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt "
+"til False"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus finnes ikke på denne maskinen eller python modulen mangler"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Sesjons bussen er ikke tilgjengelig.\n"
+"Prøv å les http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
+msgid "one"
+msgstr "Ingen"
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "hvem"
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Gate:"
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Et passord kreves for å bli med i dette samtalerommet."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Port:"
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Du er uønsket i dette rommet."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "fil"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Et slikt rom finnes ikke."
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "Rom oppretting er begrenset."
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Hendelse"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Ditt registrerte kallenavn må bli brukt. "
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Du er ikke medlems listen."
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Fortsett"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
 msgstr ""
-"Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
-"samtalebruker.\n"
-"Vennligst skriv et annet kallenavn under:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi abbonerer nå på %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Slett"
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "frakoblings ønske fra %s"
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi abbonerer ikke lenger på %s"
+msgid "%0 o'clock"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
 msgstr ""
-"Jid %s er ikke RFC kompatilbel. Den vil ikke bli lagt til kontaktlisten. "
-"Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ "
-"for å fjerne den"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Registrer til %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Jobber"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Ingen"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Hendelse"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Ikke tilgjengelig"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Borte"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Fra"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Abbonér"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Modererere"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Modererer"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Eier"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrator"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Medlem"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "skriver en melding..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d ulest melding"
+msgstr[1] "Gajim - %d uleste meldinger"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d ulest melding"
+msgstr[1] "Gajim - %d uleste meldinger"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d ulest melding"
+msgstr[1] "Gajim - %d uleste meldinger"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d ulest privat melding"
+msgstr[1] "Gajim - %d uleste private meldinger"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "turkis"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "lager logg database"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "for konto %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Kunne ikke laste bilde"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Kunne ikke koble til \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Denne meldingen er kryptert]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Abbonér"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Adresse"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Borte"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Last ned"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Legg til Spesiell Alarm for %s"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Ikke tilgjengelig"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Slett"
+
+#~ msgid "Contact _Info"
+#~ msgstr "Kontakt_Info"
+
+#~ msgid "Contact Information"
+#~ msgstr "Kontaktinformasjon"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Ugyldig rom eller servernavn"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Ukjent D-Bus versjon: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "vCard publisering vellykket"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Din personlige informasjon har blitt publisert uten feil."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Migrerer Logger..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Vennligst vent mens loggene blir migrert..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Bli med i Nytt Rom"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Gjem dette vinduet"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d ulest melding"
+#~ msgstr[1] "Gajim - %d uleste meldinger"
+
+#~ msgid "Since %s"
+#~ msgstr "Siden %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automatisk godkjenn kontakt"
 
diff --git a/po/pl.po b/po/pl.po
index 6303d7024..f4a99344f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,28 +5,30 @@
 # Automatically generated, 2005.
 #
 #
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-13 12:52+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-07-04 23:31+0200\n"
 "Last-Translator: Maciej Chojnacki <byte@byte.livenet.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "Klient Jabbera w GTK+"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Komunikator Gajim"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Klient komunikatora Jabber"
 
@@ -43,16 +45,23 @@ msgid "_Discover Services..."
 msgstr "_Wyszukuj usługi..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Pokój"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modyfikuj Konto..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Otwórz Klienta Poczty"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
 
@@ -76,7 +85,8 @@ msgstr "<b>Wpisz dane do swojego nowego konta</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Kliknij by zobaczyć możliwości serwerów jabbera (np. transporty MSN czy ICQ)"
+msgstr ""
+"Kliknij by zobaczyć możliwości serwerów jabbera (np. transporty MSN czy ICQ)"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "Connect when I press Finish"
@@ -105,7 +115,7 @@ msgid "Pass_word:"
 msgstr "_Hasło:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Zapisz _hasło"
 
@@ -130,7 +140,7 @@ msgid "Your JID:"
 msgstr "Twój JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "Z_aawansowane"
 
@@ -144,7 +154,7 @@ msgid "_Host:"
 msgstr "_Host:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Hasło:"
 
@@ -176,10 +186,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Różne</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informacje o sobie</b>"
 
@@ -196,6 +208,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Automatyczne połączenie po utracie łączności"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "P_ołącz przy starcie programu"
 
@@ -204,10 +217,18 @@ msgid "Chan_ge Password"
 msgstr "Z_mień hasło"
 
 #: ../data/glade/account_modification_window.glade.h:9
-msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
-msgstr "Zaznaczenie tej opcji spowoduje łączenia na porcie 5223 gdzie większość serwerów udostępnia usługę SSL. Gajim używa szyfrowania TLS domyślnie, jeśli tylko serwer daje taką możliwość. Ta opcja wyłącza TLS."
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Zaznaczenie tej opcji spowoduje łączenia na porcie 5223 gdzie większość "
+"serwerów udostępnia usługę SSL. Gajim używa szyfrowania TLS domyślnie, jeśli "
+"tylko serwer daje taką możliwość. Ta opcja wyłącza TLS."
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Wybierz _Klucz..."
 
@@ -224,20 +245,16 @@ msgid "Edit Personal Information..."
 msgstr "Zmień informacje o sobie..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/notify.py:308
-#: ../src/notify.py:330
-#: ../src/notify.py:342
-#: ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290
-#: ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Ogólne"
 
@@ -246,24 +263,48 @@ msgid "Hostname: "
 msgstr "Nazwa hosta: "
 
 #: ../data/glade/account_modification_window.glade.h:17
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Jeżeli opcja jest aktywna, Gajim roześle kilka dodatkowych adresów IP poza Twoim, tak aby przesyłanie plików przebiegało sprawniej."
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Jeżeli opcja jest aktywna, Gajim roześle kilka dodatkowych adresów IP poza "
+"Twoim, tak aby przesyłanie plików przebiegało sprawniej."
 
 #: ../data/glade/account_modification_window.glade.h:19
-msgid "If checked, Gajim will send keep-alive packets so it prevents connection timeout which results in disconnection"
-msgstr "Zaznaczenie tej opcji spowoduje wysyłanie pakietów podtrzymujących połączenie, co zapobiega rozłączaniu."
+msgid ""
+"If checked, Gajim will send keep-alive packets so it prevents connection "
+"timeout which results in disconnection"
+msgstr ""
+"Zaznaczenie tej opcji spowoduje wysyłanie pakietów podtrzymujących "
+"połączenie, co zapobiega rozłączaniu."
 
 #: ../data/glade/account_modification_window.glade.h:20
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Zaznaczanie tej opcji spowoduje przechowywanie hasła w pliku ~/.gajim/config z prawem do odczytu tylko dla ciebie."
+#: ../data/glade/zeroconf_properties_window.glade.h:8
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Zaznaczanie tej opcji spowoduje przechowywanie hasła w pliku ~/.gajim/config "
+"z prawem do odczytu tylko dla ciebie."
 
 #: ../data/glade/account_modification_window.glade.h:21
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Zaznaczanie tej opcji spowoduje automatyczne łączenie z siecią Jabber z wykorzystaniem tego konta."
+#: ../data/glade/zeroconf_properties_window.glade.h:9
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Zaznaczanie tej opcji spowoduje automatyczne łączenie z siecią Jabber z "
+"wykorzystaniem tego konta."
 
 #: ../data/glade/account_modification_window.glade.h:22
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Jeśli jest zaznaczone, to każda zmiana statusu globalnego (ustawianego z menu na dole okna listy kontaktów) wpłynie odpowiednio na stutus tego konta."
+#: ../data/glade/zeroconf_properties_window.glade.h:10
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"Jeśli jest zaznaczone, to każda zmiana statusu globalnego (ustawianego z "
+"menu na dole okna listy kontaktów) wpłynie odpowiednio na stutus tego konta."
 
 #: ../data/glade/account_modification_window.glade.h:23
 msgid "Information about you, as stored in the server"
@@ -274,22 +315,22 @@ msgid "Manage..."
 msgstr "Zarządzaj..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../src/config.py:1448
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../src/config.py:1053
-#: ../src/config.py:1058
-#: ../src/config.py:1230
-#: ../src/config.py:1505
-#: ../src/config.py:1578
-#: ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Żaden"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informacje osobiste"
 
@@ -302,55 +343,81 @@ msgid "Priori_ty:"
 msgstr "Priory_tet:"
 
 #: ../data/glade/account_modification_window.glade.h:31
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
-msgstr "Priorytet służy do określenia, który program ma odbierać wiadomości z serwera gdy dwa klienty (lub więcej) są połączone z tym samym kontem. Ten który ma wyższy priorytet, będzie odbierał wiadomości."
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Priorytet służy do określenia, który program ma odbierać wiadomości z "
+"serwera gdy dwa klienty (lub więcej) są połączone z tym samym kontem. Ten "
+"który ma wyższy priorytet, będzie odbierał wiadomości."
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Pośrednik:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Za_soby: "
 
-#: ../data/glade/account_modification_window.glade.h:34
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Informację wysłano do serwera w celu rozdzielenia tego samego JID na dwie lub więcej części, w zależności od liczby klientów połączonych z serwerem z tego samego konta. Możesz być połączony z z tym samym kontem z informacjami 'Dom' i 'Praca' w tym samym czasie. Klient o najwyższym będzie odbierał wiadomości (patrz niżej)."
-
 #: ../data/glade/account_modification_window.glade.h:35
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Informację wysłano do serwera w celu rozdzielenia tego samego JID na dwie "
+"lub więcej części, w zależności od liczby klientów połączonych z serwerem z "
+"tego samego konta. Możesz być połączony z z tym samym kontem z informacjami "
+"'Dom' i 'Praca' w tym samym czasie. Klient o najwyższym będzie odbierał "
+"wiadomości (patrz niżej)."
+
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Zapisz _hasło (nie jest to bezpieczne)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Zapisz _logi rozmów dla wszystkich kontaktów"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Wysyłaj pakiety podtrzymujące"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronizuj status konta z globalnym statusem"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Korzystaj z _SSL"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Użyj własnej nazwy hosta/portu"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Używaj serwerów proxy do przesyłania plików"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Nazwa: "
 
@@ -359,55 +426,89 @@ msgid "Accounts"
 msgstr "Konta"
 
 #: ../data/glade/accounts_window.glade.h:2
-msgid "If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account"
-msgstr "Jeśli masz dwa konta lub więcej, to dzięki tej opcji Gajim pokaże wszystkie kontakty w taki sposób, jakby było to jedno konto."
+msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
+"If you have 2 or more accounts and it is checked, Gajim will list all "
+"contacts as if you had one account"
+msgstr ""
+"Jeśli masz dwa konta lub więcej, to dzięki tej opcji Gajim pokaże wszystkie "
+"kontakty w taki sposób, jakby było to jedno konto."
+
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Połącz konta"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Edytuj"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Usuń"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
+#, fuzzy
+msgid "A_ccount:"
+msgstr "_Konto:"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
 msgid "A_llow this contact to view my status"
 msgstr "Pozwól mu/jej widzieć Twój status"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Dodaj nowy kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-msgid "_Account:"
-msgstr "_Konto:"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 msgid "_Group:"
 msgstr "_Grupa:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 msgid "_Nickname:"
 msgstr "_Pseudonim:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 msgid "_Protocol:"
 msgstr "P_rotokół:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Autoryzuj"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Za_rejestruj"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 msgid "_User ID:"
 msgstr "_Identyfikator użytkownika:"
 
@@ -417,7 +518,9 @@ msgstr "<b>Opis</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
-msgstr "<b>UWAGA:</b> powienieneś ponownie uruchomić program by zastosować ostatnie ustawienia"
+msgstr ""
+"<b>UWAGA:</b> powienieneś ponownie uruchomić program by zastosować ostatnie "
+"ustawienia"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -493,71 +596,57 @@ msgid "<b>Sounds</b>"
 msgstr "<b>Dźwięki</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
 msgid "Advanced Actions"
 msgstr "Opcje zaawansowane"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 msgid "Advanced Notifications Control"
 msgstr "Edytor ustawień zaawansowanych"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 msgid "All Status "
 msgstr "dowolny status "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr "podczas, gdy "
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-msgid "Away "
-msgstr "Zaraz wracam "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
+msgstr "Zaraz wracam"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 msgid "Busy "
 msgstr "Zajęty "
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr "nie rozmawiam "
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-msgid "Down"
-msgstr "W dół"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr "rozmawiam "
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 msgid "Launch a command"
 msgstr "Wykonaj komendę"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-msgid "List of special notifications settings"
-msgstr "Lista akcji dla powiadomień"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid "Not Available "
-msgstr "Nieobecny "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
+msgstr "Nieobecny"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 msgid "Online / Free For Chat"
 msgstr "Dostępny / Chętny do rozmowy"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 msgid "Play a sound"
 msgstr "Odtwórz dźwięk"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -579,59 +668,60 @@ msgstr ""
 "rozpocznie się transfer pliku\n"
 "zakończy się transfer pliku"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr "określony status..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr "Do góry"
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr "Jeżeli "
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr "_Migaj obramowaniem okna rozmowy"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable auto opening chat window"
 msgstr "Wyłącz _automatyczne otwieranie okna czatu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr "_Wyłącz wyskakujące okienka"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr "_Wyłącz dźwięki dla tego zdarzenia"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr "Wyłącz _pokazywanie zdarzenia na liście kontaktów"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr "Wyłącz pokazywanie _zdarzenia w obszarze powiadamiania"
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr "_Powiadom mnie wyskakującym okienkiem"
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Open chat window with user"
 msgstr "_Otwórz okno rozmowy z kontaktem"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in roster"
 msgstr "_Pokaż zdarzenie na liście kontaktów"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "_Show event in systray"
 msgstr "Pokaż _zdarzenie w obszarze powiadamiania"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+#, fuzzy
+msgid "and I "
+msgstr "podczas, gdy "
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
@@ -641,11 +731,11 @@ msgstr ""
 "grupy(grup)\n"
 "wszystkich"
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "for "
 msgstr "dla "
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr "kiedy mam "
 
@@ -680,7 +770,7 @@ msgstr "Dołącz do _pokoju"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "Dod_aj do listy kontaktów"
 
@@ -701,7 +791,8 @@ msgid "_Open Link in Browser"
 msgstr "_Otwórz Link w przeglądarce"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Rozpocznij rozmowę"
@@ -711,7 +802,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Kliknij by zobaczyć poprzednie rozmowy z tym kontaktem"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Wyślij _plik"
 
@@ -727,7 +819,8 @@ msgstr "Widok _zwarty    Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historia"
 
@@ -780,15 +873,18 @@ msgid "Shows a list of file transfers between you and other"
 msgstr "Pokaż listę przesłanych plików pomiędzy tobą a innymi"
 
 #: ../data/glade/filetransfers.glade.h:11
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "To działanie spowoduje usunięcie przesyłu pliku z listy. Jeśli jest on aktywnyto najpierw zostanie zatrzymany a dopiero potem usunięty."
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"To działanie spowoduje usunięcie przesyłu pliku z listy. Jeśli jest on "
+"aktywnyto najpierw zostanie zatrzymany a dopiero potem usunięty."
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
@@ -796,8 +892,7 @@ msgstr "_Kontynuuj"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca."
 
-#: ../data/glade/filetransfers.glade.h:15
-#: ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190
 msgid "_Open Containing Folder"
 msgstr "_Otwórz katalog zawierający ten plik."
 
@@ -826,40 +921,34 @@ msgstr ""
 "Banner"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4
-#: ../src/config.py:326
-msgid "Active"
-msgstr "Aktywny"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Wytłuszczone"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Tworzenie wiadomości"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Styl czcionki:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Wybieranie motywów dla Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Zniknął"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Nieaktywny"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Kursywa"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -867,7 +956,7 @@ msgstr ""
 "MUC\n"
 "Wiadomości"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -875,20 +964,19 @@ msgstr ""
 "Czat\n"
 "Wiadomości"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
-#: ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Zatrzymany"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "_Kolor tekstu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "_Czcionka tekstu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Tło:"
 
@@ -955,14 +1043,18 @@ msgid ""
 "You can select logs from the left and/or search database from below.\n"
 "\n"
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<big><b>Witamy w Menedżerze historii rozmów Gajima</b></big>\n"
 "\n"
-"Z lewej strony znajduje się lista logów z historią rozmów, za pomocą poniższego pola możesz bezpośrednio przeszukiwać bazę danych.\n"
+"Z lewej strony znajduje się lista logów z historią rozmów, za pomocą "
+"poniższego pola możesz bezpośrednio przeszukiwać bazę danych.\n"
 "\n"
 "<b>UWAGA:</b>\n"
-"Jeżeli chcesz usuwać wiele danych, upewnij się najpierw że Gajim nie jest uruchomiony. Unikaj też usuwania historii rozmów kontaktów, z którymi właśnie rozmawiasz."
+"Jeżeli chcesz usuwać wiele danych, upewnij się najpierw że Gajim nie jest "
+"uruchomiony. Unikaj też usuwania historii rozmów kontaktów, z którymi "
+"właśnie rozmawiasz."
 
 #: ../data/glade/history_manager.glade.h:7
 msgid "Delete"
@@ -1005,7 +1097,7 @@ msgid "Accept"
 msgstr "Akceptuj"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Odmów"
 
@@ -1013,14 +1105,14 @@ msgstr "Odmów"
 msgid "Invitation Received"
 msgstr "Zaproszenie Odebrane"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Pseudonim:"
 
@@ -1038,14 +1130,8 @@ msgstr "Ostatnio:"
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Serwer:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7
-#: ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Dołącz"
 
@@ -1069,6 +1155,10 @@ msgstr "Zarządzaj zakładkami"
 msgid "Print status:"
 msgstr "Wyświetlaj status:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Serwer:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Tytuł:"
@@ -1090,7 +1180,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Zarządzaj profilami pośrednika"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Nazwa:"
 
@@ -1106,21 +1197,21 @@ msgstr "Używaj autoryzacji"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Kliknij by wstawić emotikon (Alt+E)"
 
-#: ../data/glade/message_window.glade.h:2
-#: ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "Szyfrowanie OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "Dzi_ałania"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Wyślij"
 
@@ -1185,25 +1276,34 @@ msgstr "Zezwól na wysyłanie informacji o systemie _operacyjnym"
 
 #: ../data/glade/preferences_window.glade.h:18
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Pokazuj powiadomienia gdy mam status _zaraz wracam/nieobecny/zajęty/niewidoczny."
+msgstr ""
+"Pokazuj powiadomienia gdy mam status _zaraz wracam/nieobecny/zajęty/"
+"niewidoczny."
 
 #: ../data/glade/preferences_window.glade.h:19
 msgid "Also known as iChat style"
 msgstr "Znany także jako styl iChat"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Pytaj o opis przy zmianie statusu na:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Automatyczny status '_Zaraz wracam' po:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Automatyczny status '_Nieobecny' po:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1215,100 +1315,159 @@ msgstr ""
 "Zawsze używaj domyślnych aplikacji KDE\n"
 "Własne"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "_Przed pseudonimem:"
 
-#: ../data/glade/preferences_window.glade.h:28
-#: ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Rozmowa"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Powiadomienia o stanie _rozmowy:"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, cause it blocks all messages from any contact that is not in the roster"
-msgstr "Zaznacz tę opcję tylko jeśli ktoś spoza listy kontaktów nęka Cię wiadomościami. Stosuj ją ostrożnie, ponieważ powoduje ona blokowanie wszystkich wiadomości osób, których nie masz na liście kontaktów."
-
 #: ../data/glade/preferences_window.glade.h:31
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, cause it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Zaznacz tę opcję tylko jeśli ktoś spoza listy kontaktów nęka Cię "
+"wiadomościami. Stosuj ją ostrożnie, ponieważ powoduje ona blokowanie "
+"wszystkich wiadomości osób, których nie masz na liście kontaktów."
+
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Opis statusu"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "Domyślny zestaw ikon _statusu:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr "Wyświetlaj _dodatkowe informacje o poczcie e-mail"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Wyświetlaj awatary kontaktów z listy"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Wyświetlaj _opisy statusu kontaktu na liście kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "Co 5 _minut"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Emotikony:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Zdarzenia"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party."
-msgstr "Gajim może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową. W tym miejscu możesz zdecydować, jakie dane chcesz wysyłać do rozmówcy."
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Gajim will automatically show new events by poping up the relative window"
-msgstr "Gajim automatycznie wyświetli nową wiadomość w nowym oknie lub w nowej karcie otwartego okna rozmowy."
-
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Gajim will notify you for new events via a popup in the bottom right of the screen"
-msgstr "Gajim powiadomi Cię o nadejściu nowej wiadomości wyświetlając okienko w prawym dolnym rogu ekranu."
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową. "
+"W tym miejscu możesz zdecydować, jakie dane chcesz wysyłać do rozmówcy."
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
-msgstr "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o kontaktach, które zmieniają status na Dostępny."
+msgid ""
+"Gajim will automatically show new events by poping up the relative window"
+msgstr ""
+"Gajim automatycznie wyświetli nową wiadomość w nowym oknie lub w nowej "
+"karcie otwartego okna rozmowy."
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o kontaktach które zmieniają status na Rozłączony."
+msgid ""
+"Gajim will notify you for new events via a popup in the bottom right of the "
+"screen"
+msgstr ""
+"Gajim powiadomi Cię o nadejściu nowej wiadomości wyświetlając okienko w "
+"prawym dolnym rogu ekranu."
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim zmieni jedynie ikonę kontaktu, który przysłał nową wiadomość."
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed in"
+msgstr ""
+"Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
+"kontaktach, które zmieniają status na Dostępny."
 
-#: ../data/glade/preferences_window.glade.h:45
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy kontaktów (roster oraz okno czatu)."
+#: ../data/glade/preferences_window.glade.h:44
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
+"kontaktach które zmieniają status na Rozłączony."
 
-#: ../data/glade/preferences_window.glade.h:46
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Jeśli jest zaznaczone, Gajim będzie wyświetlał opis statusu kontaktu pod jego nazwą na liście kontaktów."
+#: ../data/glade/preferences_window.glade.h:45
+msgid ""
+"Gajim will only change the icon of the contact that triggered the new event"
+msgstr "Gajim zmieni jedynie ikonę kontaktu, który przysłał nową wiadomość."
 
 #: ../data/glade/preferences_window.glade.h:47
-msgid "If checked, Gajim will remember the roster and chat window positions in the screen and the sizes of them next time you run it"
-msgstr "Zaznaczenie tej opcji spowoduje zapamiętanie położenia głównego okna programu na ekranie oraz jego rozmiaru."
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:48
-msgid "If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)"
-msgstr "Dzięki tej opcji Gajim będzie używał zestawów ikon charakterystycznych dla transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu dostępny, zaraz wracam, zajęty, itd."
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy "
+"kontaktów (roster oraz okno czatu)."
 
 #: ../data/glade/preferences_window.glade.h:49
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Zaznaczenie tej opcji spowoduje zastąpienie emotikon tekstowych jak ':)' emotikonami graficznymi."
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Jeśli jest zaznaczone, Gajim będzie wyświetlał opis statusu kontaktu pod "
+"jego nazwą na liście kontaktów."
 
 #: ../data/glade/preferences_window.glade.h:50
+msgid ""
+"If checked, Gajim will remember the roster and chat window positions in the "
+"screen and the sizes of them next time you run it"
+msgstr ""
+"Zaznaczenie tej opcji spowoduje zapamiętanie położenia głównego okna "
+"programu na ekranie oraz jego rozmiaru."
+
+#: ../data/glade/preferences_window.glade.h:51
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Dzięki tej opcji Gajim będzie używał zestawów ikon charakterystycznych dla "
+"transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu "
+"dostępny, zaraz wracam, zajęty, itd."
+
+#: ../data/glade/preferences_window.glade.h:52
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Zaznaczenie tej opcji spowoduje zastąpienie emotikon tekstowych jak ':)' "
+"emotikonami graficznymi."
+
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "Za_rządzaj..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1320,221 +1479,240 @@ msgstr ""
 "Według konta\n"
 "Według typu"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Powiadom mnie o kontaktach zmieniających status na: "
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 msgid "Notify on new _GMail email"
 msgstr "Powiadamiaj o nowej poczcie na koncie _GMail"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "W każdej _wiadomości"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "Grupuj okna:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Odtwórz _dźwięk"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Wyświetlaj czas:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "Zapisz _pozycję i rozmiar okna kontaktów i okna rozmowy"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Pokaż tylko _listę kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_Połączony"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "R_ozłączony"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "_Motyw:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Automatyczny status \"Zaraz wracam\""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Automatyczny status \"Nieobecny\"."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Używaj zestawów ikon _transportów"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr "Użyj _domyślnej dla systemu"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Ikona w obszarze powiadamiania"
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid "When a new event (message, file transfer request etc..) is received, the following methods may be used to inform you about it. Please note that events about new messages only occur if it is a new message from a contact you are not already chatting with"
-msgstr "Kiedy pojawi się nowe zdarzenie (wiadomość, prośba o przesłanie pliku itp.), możesz zostać o tym powiadomiony na takie sposoby. UWAGA: Nowa wiadomość pojawia się jeśli nie pochodzi od osoby, z którą aktualnie rozmawiasz."
+#: ../data/glade/preferences_window.glade.h:77
+msgid ""
+"When a new event (message, file transfer request etc..) is received, the "
+"following methods may be used to inform you about it. Please note that "
+"events about new messages only occur if it is a new message from a contact "
+"you are not already chatting with"
+msgstr ""
+"Kiedy pojawi się nowe zdarzenie (wiadomość, prośba o przesłanie pliku itp.), "
+"możesz zostać o tym powiadomiony na takie sposoby. UWAGA: Nowa wiadomość "
+"pojawia się jeśli nie pochodzi od osoby, z którą aktualnie rozmawiasz."
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Gdy odebrane zostanie nowe zdarzenie"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "_Advanced Notifications Control..."
 msgstr "_Edytor zaawansowanych ustawień"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "_Po czasie:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "P_rzed czasem:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "Prze_glądarka:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "Menadżer _plików:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Czcionka:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "Podś_wietlaj błędy w pisowni"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruj wiadomości od osób spoza listy kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "Wiadomość _otrzymana:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "Klient _poczty:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Nigdy"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "Powia_dom mnie o tym"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Otwórz..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "Wysłana wiadomość :"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Program odtwarzający dźwięk:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Wyświetl"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "Wróć do kolorów _domyślnych"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "Sortuj kontakty według statusu"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "_Informacja o statusie:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minutach"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Listy prywatności"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Dodaj / Edytuj regułę</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Lista reguł</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<p>Lista prywatności</i>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5
-#: ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "P_ołącz przy starcie programu"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr "wszystkim"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr "Zezwól"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-msgid "Default"
-msgstr "Domyślny"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "Order:"
 msgstr "Kolejność:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11
-#: ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 msgid "Privacy List"
 msgstr "Lista prywatności"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 msgid "all by subscription"
 msgstr "według autoryzacji"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all in the group"
 msgstr "według grupy"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1546,29 +1724,169 @@ msgstr ""
 "od\n"
 "do"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 msgid "to send me messages"
 msgstr "wysyłać mi wiadomości"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr "wysyłać kwerendy"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me status"
 msgstr "wysyłać mi status"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to view my status"
 msgstr "widzieć mój status"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr "Stwórz własną listę prywatności"
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Informacje"
+
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adres"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr "Listy prywatności po stronie serwera"
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Ustaw _Awatar"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Urodziny:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Miasto:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Firma:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Kraj:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Dział:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Adres e-mail:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Dodatkowy adres:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Nazwisko:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: RRRR-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Imię:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Strona domowa:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Drugie imię:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Więcej"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Informacje osobiste"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefon:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Stanowisko:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Kod pocztowy:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Prefiks:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Funkcja:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Stan/Województwo:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Ulica:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Sufiks:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Praca"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Publikuj"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Przywróć"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1587,45 +1905,56 @@ msgid "A_sk to see his/her status"
 msgstr "Poproś o to, żeby móc widzieć jego/jej _status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Dodaj powiadomienia _specjalne"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Przypisz klucz Open_PGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Wyślij _wiadomość"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Rozpocznij _rozmowę"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Allow him/her to see my status"
 msgstr "_Pozwól mu/jej widzieć swój status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabroń mu/jej widzieć twój status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Usuń z listy kontaktów"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Autoryzacja"
 
@@ -1650,43 +1979,53 @@ msgid "Help online"
 msgstr "Pomoc w sieci"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Profil, Awatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transporty"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Pokaż kontakty niep_ołączone"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Zawartość"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Wyszukuj usługi"
 
-#: ../data/glade/roster_window.glade.h:13
-#: ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Ustawienia"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Zakończ"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Głos"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "I_dź"
@@ -1756,22 +2095,20 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Autoryzuj kontakt - będzie wówczas wiedział, kiedy jesteś połączony"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "_Informacje o kontakcie"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
-msgstr "Odmów autoryzacji kontaktowi, nie będzie on wówczas wiedział kiedy jesteś połączony."
+msgstr ""
+"Odmów autoryzacji kontaktowi, nie będzie on wówczas wiedział kiedy jesteś "
+"połączony."
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Prośba o autoryzację"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Autoryzuj"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "O_dmów"
 
@@ -1787,164 +2124,51 @@ msgstr "Pokaż _listę kontaktów"
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Informacje"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adres"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Pytaj:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Urodziny:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Miasto:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Firma:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Informacje o kontakcie"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Kraj:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Dział:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "Adres e-mail:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Dodatkowy adres:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Nazwisko:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: RRRR-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Imię:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Strona domowa:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakty"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Miejsce"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Drugie imię:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Więcej"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "System operacyjny:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Telefon:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Stanowisko:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Kod pocztowy:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Prefiks:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Zasoby:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Funkcja:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Ustaw _Awatar"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Stan/Województwo:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Ulica:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Autoryzacja:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Sufiks:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Praca"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Zapisuj historię rozmowy"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Publikuj"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Przywróć"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Traffic</b>"
@@ -1976,328 +2200,512 @@ msgstr "Wiado_mość"
 msgid "_Presence"
 msgstr "_Obecność"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Nazwa:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Nazwa:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Informacje osobiste"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Modyfikuj Konto..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Użyj własnej nazwy hosta/portu"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Nazwa opcji"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Wartość"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Brak)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Ukryte"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163
-#: ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Ogólne"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "zielony"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Miejsce"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Kursywa"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Publikuj"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
-"If that is not your language for which you want to highlight misspelled words, then please set your $LANG as appropriate. Eg. for French do export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
+"If that is not your language for which you want to highlight misspelled "
+"words, then please set your $LANG as appropriate. Eg. for French do export "
+"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
+"global in /etc/profile.\n"
 "\n"
 "Highlighting misspelled words feature will not be used"
 msgstr ""
-"Jeśli podświetlanie błędów w pisowni działa dla niewłaściwego języka, to ustaw odpowiednio zmienną środowiskową $LANG. Np. dla języka polskiego wpisz export LANG=pl_PL do pliku ~/.bash_profile lub globalnie do pliku in /etc/profile.\n"
+"Jeśli podświetlanie błędów w pisowni działa dla niewłaściwego języka, to "
+"ustaw odpowiednio zmienną środowiskową $LANG. Np. dla języka polskiego wpisz "
+"export LANG=pl_PL do pliku ~/.bash_profile lub globalnie do pliku in /etc/"
+"profile.\n"
 "\n"
 "Podświedlanie błędów w pisowni nie będzie używane."
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186
-#: ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/chat_control.py:187
-#: ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Rozmowy"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s: %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "Ani %s nie przesyła swojego klucza OpenPGP, ani Ty nie przypisałeś mu żadnego klucza."
+msgstr ""
+"Ani %s nie przesyła swojego klucza OpenPGP, ani Ty nie przypisałeś mu "
+"żadnego klucza."
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Szyfrowanie włączone"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Szyfrowanie wyłączone"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239
-#: ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512
-#: ../src/gajim.py:635
-#: ../src/gajim.py:636
-#: ../src/gajim.py:955
-#: ../src/roster_window.py:276
-#: ../src/roster_window.py:1335
-#: ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806
-#: ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123
-#: ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977
-#: ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39
-#: ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Właśnie otrzymałeś nową wiadomość od \"%s\""
 
-#: ../src/chat_control.py:1384
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to utracisz tę wiadomość."
+#: ../src/chat_control.py:1527
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
+"utracisz tę wiadomość."
 
-#: ../src/config.py:120
-#: ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Co %s _minut"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Aktywny"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Połączenie jest niemożliwe"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Otrzymałeś nową wiadomość"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1158
-#: ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Nieprzeczytane wiadomości"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
-msgstr "Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
+msgstr ""
+"Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
 
-#: ../src/config.py:1164
-msgid "This name is already used by another of your accounts. Please choose another name."
+#: ../src/config.py:1290
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 msgstr "Posiadasz już konto o tej nazwie. Zmień nazwę konta na unikalną."
 
-#: ../src/config.py:1168
-#: ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1181
-#: ../src/config.py:1187
-#: ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Czy zalogować się ponownie?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz zalogować się ponownie."
+msgstr ""
+"Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz "
+"zalogować się ponownie."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 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:1410
-#: ../src/dialogs.py:925
-#: ../src/dialogs.py:1099
-#: ../src/disco.py:410
-#: ../src/vcard.py:457
-#: ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Musisz być połączony, aby móc zmieniać informacje o sobie."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "Musisz najpierw stworzyć konto by móc edytować informacje o sobie."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
+msgstr ""
+"Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
 #. Name column
-#: ../src/config.py:1667
-#: ../src/disco.py:727
-#: ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
-msgstr "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
+msgstr ""
+"Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
+
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Żadne z twoich kont nie jest aktywne."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Konto o takiej nazwie już istnieje"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych."
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020
-#: ../src/disco.py:734
-#: ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2305,11 +2713,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2317,11 +2725,11 @@ msgstr ""
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2329,11 +2737,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2341,7 +2749,7 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2357,647 +2765,676 @@ msgstr ""
 "4. domena (dotyczy domeny a także dowolnego adresu typu użytkownik@domena,\n"
 "domena/zasób lub adresu zawierającego subdomenę)."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2183
-#: ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2184
-#: ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2185
-#: ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nowy pokój"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Pokój"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2384
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2668
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Upewnij się, że wypełniłeś pola serwer i pokój lub usuń tę zakładkę."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:2648
-#: ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Musisz wpisać hasło dla nowego konta."
 
-#: ../src/config.py:2653
-#: ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się."
 
-#: ../src/config.py:2654
-#: ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Taki Jabber ID już istnieje!"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Konto o takiej nazwie jest już skonfigurowane."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:2692
-#: ../src/config.py:2725
-msgid "You can set advanced account options by pressing Advanced button, or later by clicking in Accounts menuitem under Edit menu from the main window."
-msgstr "Możesz ustawić opcje zaawansowane wciskając przycisk Zaawansowane lub później wybierając pozycję Konta z menu Edytuj w głównym oknie programu."
+#: ../src/config.py:2982 ../src/config.py:3015
+msgid ""
+"You can set advanced account options by pressing Advanced button, or later "
+"by clicking in Accounts menuitem under Edit menu from the main window."
+msgstr ""
+"Możesz ustawić opcje zaawansowane wciskając przycisk Zaawansowane lub "
+"później wybierając pozycję Konta z menu Edytuj w głównym oknie programu."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta."
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/conversation_textview.py:205
-msgid "Text below this line is what has been said since the last time you paid attention to this group chat"
-msgstr "Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju od momentu gdy ostatni raz zwracałeś/zwracałaś na niego uwagę."
+#: ../src/conversation_textview.py:273
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
+msgstr ""
+"Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju od "
+"momentu gdy ostatni raz zwracałeś/zwracałaś na niego uwagę."
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Działania dla wyrażenia \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "W URL-u słownika brakuje \"%s\" i nie jest to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "%i dni temu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "Na tym komputerze brakuje pythonowych dowiązań do D-Bus."
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Nie można użyć D-Bus."
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Nazwa kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "W grupie"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "Identyfikator klucza"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Opis statusu"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Szablony opisów"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Podaj nazwę dla tego szablonu"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Adres:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Adres:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Dodatkowy adres:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać do konta %s."
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać."
 
-#: ../src/dialogs.py:403
-#: ../src/disco.py:109
-#: ../src/disco.py:110
-#: ../src/disco.py:1249
-#: ../src/roster_window.py:207
-#: ../src/roster_window.py:273
-#: ../src/roster_window.py:309
-#: ../src/roster_window.py:329
-#: ../src/roster_window.py:353
-#: ../src/roster_window.py:2973
-#: ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/dialogs.py:493
-#: ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "_Identyfikator użytkownika:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr "Wersja GTK+:"
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr "Wersja PyGTK:"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 msgid "Current Developers:"
 msgstr "Bieżący deweloperzy:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Poprzedni deweloperzy:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "Podziękowania:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "I wreszcie, chcielibyśmy podziękować wszystkim opiekunom pakietów."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr ""
 "Tłumaczenie na język polski: Witold Kieraś <pambuk@gmail.com>\n"
 "Maciej Chojnacki <byte@byte.livenet.pl>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Nie można podłączyć się do portu %s."
 
-#: ../src/dialogs.py:739
-msgid "Maybe you have another running instance of Gajim. File Transfer will be canceled."
-msgstr "Być może masz już uruchomioną inną kopię Gajima. Przesyłanie plików zostanie anulowane."
+#: ../src/dialogs.py:887
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"canceled."
+msgstr ""
+"Być może masz już uruchomioną inną kopię Gajima. Przesyłanie plików zostanie "
+"anulowane."
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Prośba o autoryzację dla konta %s od %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Już jesteś w pokoju %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nie możesz dołączyć do pokoju gdy nie jesteś połączony."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s."
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Niepoprawna nazwa pokoju lub serwera"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Niepoprawny Jabber ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Nazwa pokoju lub nazwa serwera zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowę z konta %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
+#, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Wpisz jid lub nazwę użytkownika kontaktu, któremu chcesz\n"
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078
-#: ../src/dialogs.py:1427
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:1079
-#: ../src/dialogs.py:1428
-#: ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:1088
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie można sparsować \"%s\"."
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Nie możesz zmienić hasła, jeśli nie jesteś połączony."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165
-#: ../src/notify.py:126
-#: ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:1167
-#: ../src/notify.py:134
-#: ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #. chat message
-#: ../src/dialogs.py:1169
-#: ../src/notify.py:154
-#: ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #. single message
-#: ../src/dialogs.py:1169
-#: ../src/notify.py:138
-#: ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
 #. private message
-#: ../src/dialogs.py:1170
-#: ../src/notify.py:145
-#: ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:1170
-#: ../src/gajim.py:1044
-#: ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:1172
-#: ../src/gajim.py:1187
-#: ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:1174
-#: ../src/gajim.py:1022
-#: ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:1176
-#: ../src/gajim.py:1222
-#: ../src/gajim.py:1244
-#: ../src/gajim.py:1261
-#: ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku."
 
-#: ../src/dialogs.py:1177
-#: ../src/gajim.py:1225
-#: ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:1179
-#: ../src/gajim.py:920
-#: ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: ../src/dialogs.py:1181
-#: ../src/notify.py:118
-#: ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
 msgstr "wiadomość z konta %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
+msgstr "wiadomość z konta %s"
+
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Opis: %s"
+
+#: ../src/dialogs.py:1878
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s zaprasza cię do pokoju %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:2064
-#: ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 msgid "Condition"
 msgstr "Warunek"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+#, fuzzy
+msgid "when I am "
+msgstr "kiedy mam "
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Inni"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Konferencja"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Nie możesz przeglądać usług, jeśli nie jesteś połączony."
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Przeglądanie usług przy użyciu konta %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Nie można odnaleźć usługi"
 
-#: ../src/disco.py:629
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź adres i spróbuj ponownie."
+#: ../src/disco.py:638
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź "
+"adres i spróbuj ponownie."
 
-#: ../src/disco.py:633
-#: ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Tej usługi nie można przeglądać"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Tego typu usługa nie zawiera elementów, które można przeglądać."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Przeglądanie %s przy użyciu konta %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "Prze_glądaj"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Usługa nie zawiera elementów, które można przeglądać."
 
-#: ../src/disco.py:1137
-#: ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanowanie %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Użytkownicy"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Opis"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Plik"
@@ -3010,35 +3447,30 @@ msgstr "Czas"
 msgid "Progress"
 msgstr "Postęp"
 
-#: ../src/filetransfers_window.py:163
-#: ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazwa pliku: %s"
 
-#: ../src/filetransfers_window.py:164
-#: ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Rozmiar: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:173
-#: ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Ty"
 
 #: ../src/filetransfers_window.py:174
-#: ../src/filetransfers_window.py:224
 #, python-format
 msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
-#: ../src/filetransfers_window.py:175
-#: ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
@@ -3051,88 +3483,97 @@ msgstr "Zapisane w: %s"
 msgid "File transfer completed"
 msgstr "Zakończono przesyłanie pliku."
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
 msgid "File transfer canceled"
 msgstr "Transfer pliku skasowany"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
 msgid "Connection with peer cannot be established."
 msgstr "Nie można ustanowić połączenia z drugą stroną."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Odbiorca: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Błąd odczytu pliku:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Przesyłanie pliku zostało zatrzymane przez drugą osobę."
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Wybierz plik do wysłania..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim nie może uzyskać dostępu do tego pliku"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Ten plik jest używany przez inny proces."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Plik: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s chce przesłać Ci plik:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie można nadpisać pliku \"%s\""
 
-#: ../src/filetransfers_window.py:312
-msgid "A file with this name already exists and you do not have permission to overwrite it."
-msgstr "Istnieje już plik o tej nazwie a Ty nie masz uprawnień do jego nadpisania."
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"Istnieje już plik o tej nazwie a Ty nie masz uprawnień do jego nadpisania."
 
-#: ../src/filetransfers_window.py:319
-#: ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: ../src/filetransfers_window.py:319
-#: ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Nie masz uprawnień do zapisu w folderze \"%s\""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie masz uprawnień do tworzenia plików w tym folderze."
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Zapisz obraz jako..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3140,275 +3581,504 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ów)"
 
-#: ../src/filetransfers_window.py:528
-#: ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Niepoprawny plik"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Plik: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: ../src/filetransfers_window.py:552
-#: ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../src/filetransfers_window.py:554
-#: ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Zatrzymaj"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim wymaga do działania serwera X. Zakończenie..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim wymaga PyGTK w wersji 1.6 lub wyższej"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr ""
+"Gajim wymaga do działania PyGTK w wersji 1.6 lub wyższej. Zakończenie..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim wymaga GTK w wersji 2.6 lub wyższej"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim wymaga do działania GTK w wersji 2.6 lub wyższej. Zakończenie..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "W GTK+ brakuje wsparcia dla libglade"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję z %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Sprawdź, czy GTK+ oraz PyGTK posiadają w twoim systemie wsparcie dla "
+"libglade."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim wymaga do działania PySQLite2"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim wymaga do działania PySQLite2"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr "Gajim jest już uruchomiony"
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"Wydaje się, że w tle działa już inna kopia Gajima.\n"
+"Czy mimo to chcesz uruchomić program?"
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Czy akceptujesz tę prośbę?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Połączenie"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Temat: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "błąd przy wysyłaniu %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Autoryzacja przyjęta"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Nie można ustanowić połączenia z \"%s\""
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Sprawdź swoje połączenie lub spróbuj później."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s ma teraz status %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Twoje hasło jest niepoprawne."
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Masz %d nieprzeczytaną wiadomość pocztową"
+msgstr[1] "Masz %d nieprzeczytane wiadomości pocztowe"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"Od: %(from_address)s"
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s chce przesłać ci plik."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Otrzymałeś plik %(filename)s od %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Przesyłanie pliku %(filename)s·od·%(name)s·zostało zatrzymane."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Przesłałeś plik %(filename)s do %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Przesyłanie pliku·%(filename)s·do·%(name)s·zostało zatrzymane."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Wpisz dane do swojego nowego konta</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Nie można zapisać twoich ustawień i opcji."
+
+#: ../src/gajim.py:1998
+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-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "pokaż pomoc dla wybranego polecenia"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "polecenie"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "pokaż pomoc polecenia"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Pokazuje lub ukrywa okno listy kontaktów."
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
 
-#: ../src/gajim-remote.py:98
-msgid "Prints a list of all contacts in the roster. Each contact appear on a separate line"
-msgstr "Wypisuje listę wszystkich kontaktów. Każdy kontakt zostanie wypisany w osobnej linii."
-
-#: ../src/gajim-remote.py:100
-#: ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202
-#: ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218
-#: ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:82
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appear on a "
+"separate line"
+msgstr ""
+"Wypisuje listę wszystkich kontaktów. Każdy kontakt zostanie wypisany w "
+"osobnej linii."
+
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "pokaż tylko kontakty z danego konta"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Wypisuje listę zarejestrowanych kont"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Zmienia status kont lub kont."
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, zajęty, niewidoczny "
+msgstr ""
+"jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, "
+"zajęty, niewidoczny "
 
-#: ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "wiadomość"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "informacja o statusie"
 
-#: ../src/gajim-remote.py:114
-msgid "change status of account \"account\". If not specified, try to change status of all accounts that have \"sync with global status\" option set"
-msgstr "zmień status konta \"konto\". Jeśli nie jest on określony, to spróbuj zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze statusem globalnym."
+#: ../src/gajim-remote.py:98
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"zmień status konta \"konto\". Jeśli nie jest on określony, to spróbuj "
+"zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
+"statusem globalnym."
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Pokazuje okno dialogowe umożliwiające wysłanie wiadomości do kontaktu."
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID osoby, z którą chcesz porozmawiać"
 
-#: ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
-msgstr "jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta."
+msgstr ""
+"jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta."
 
-#: ../src/gajim-remote.py:129
-msgid "Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', to ustaw 'klucz OpenPGP' na ''."
+#: ../src/gajim-remote.py:113
+msgid ""
+"Sends new chat message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto "
+"nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
+"to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "zawartość wiadomości"
 
-#: ../src/gajim-remote.py:135
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "klucz pgp"
 
-#: ../src/gajim-remote.py:135
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym."
+msgstr ""
+"jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym."
 
-#: ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "jeśli jest podane, to wiadomość zostanie wysłana z tego konta."
 
-#: ../src/gajim-remote.py:142
-msgid "Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', to ustaw 'klucz OpenPGP' na ''."
+#: ../src/gajim-remote.py:126
+msgid ""
+"Sends new single message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto "
+"nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
+"to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 msgid "subject"
 msgstr "temat"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 msgid "message subject"
 msgstr "temat wiadomości"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Pobiera szczegółowe informacje o kontakcie"
 
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Pobiera szczegółowe informacje o koncie"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Nazwa konta"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Wysyła plik kontaktowi"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "plik"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Ścieżka do pliku"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "plik zostanie wysłany z tego konta, jeśli jest ono podane."
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Wypisuje wszystkie opcje i ich wartości"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ustawia wartość 'klucza' na 'wartość'."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "klucz=wartość"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klucz' jest nazwą opcji, 'wartość' zaś jest jej ustawianą wartością."
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Usuwa opcję"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "klucz"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "nazwa opcji do usunięcia"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje obecny stan opcji Gajima do pliku .config"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt do listy kontaktów"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 msgid "Adds new contact to this account"
 msgstr "Dodaje nowy kontakt do tego konta"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba, że zostało wskazane konto)."
 
-#: ../src/gajim-remote.py:223
-msgid "Returns current status message(the global one unless account is specified)"
+#: ../src/gajim-remote.py:207
+msgid ""
+"Returns current status message(the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba że zostało wskazane konto)."
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Zwraca liczbę nieprzeczytanych wiadomości."
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+#, fuzzy
+msgid "Opens 'Start Chat' dialog"
 msgstr "Otwórz okno dialogowe 'Rozpocznij rozmowę'"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 msgid "Starts chat, using this account"
 msgstr "Rozpocznij rozmowę z tego konta"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "Konsola XML"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3417,16 +4087,11 @@ msgstr ""
 "'%s' nie znajduje się na twojej liście kontaktów.\n"
 "Podaj konto, na które ma zostać wysłana ta wiadomość."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne."
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Nieznana wersja D-Bus: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3435,16 +4100,16 @@ msgstr ""
 "Użycie:·%s·%s·%s·\n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3453,7 +4118,7 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3462,696 +4127,586 @@ msgstr ""
 "Argument \"%s\" nie jest określony. \n"
 "Wpisz \"%s·help·%s\" aby uzyskać więcej informacji."
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim wymaga do działania serwera X. Zakończenie..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim wymaga PyGTK w wersji 1.6 lub wyższej"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim wymaga do działania PyGTK w wersji 1.6 lub wyższej. Zakończenie..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim wymaga GTK w wersji 2.6 lub wyższej"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim wymaga do działania GTK w wersji 2.6 lub wyższej. Zakończenie..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "W GTK+ brakuje wsparcia dla libglade"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję z %s"
-
-#: ../src/gajim.py:65
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Sprawdź, czy GTK+ oraz PyGTK posiadają w twoim systemie wsparcie dla libglade."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim wymaga do działania PySQLite2"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr "Gajim jest już uruchomiony"
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Wydaje się, że w tle działa już inna kopia Gajima.\n"
-"Czy mimo to chcesz uruchomić program?"
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Czy akceptujesz tę prośbę?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "błąd przy wysyłaniu %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Autoryzacja przyjęta"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Nie można ustanowić połączenia z \"%s\""
-
-#: ../src/gajim.py:705
-#: ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Sprawdź swoje połączenie lub spróbuj później."
-
-#: ../src/gajim.py:849
-#: ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s ma teraz status %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Twoje hasło jest niepoprawne."
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Masz %d nieprzeczytaną wiadomość pocztową"
-msgstr[1] "Masz %d nieprzeczytane wiadomości pocztowe"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-"\n"
-"Od: %(from_address)s"
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s chce przesłać ci plik."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Otrzymałeś plik %(filename)s od %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Przesyłanie pliku %(filename)s·od·%(name)s·zostało zatrzymane."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Przesłałeś plik %(filename)s do %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Przesyłanie pliku·%(filename)s·do·%(name)s·zostało zatrzymane."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "Publikacja vCard powiodła się"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Informacje o tobie zostały opublikowane."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "Publikacja vCard nie powiodła się"
-
-#: ../src/gajim.py:1304
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie później."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Nie można zapisać twoich ustawień i opcji."
-
-#: ../src/gajim.py:1903
-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:1932
-msgid "Migrating Logs..."
-msgstr "Przenoszenie logów..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Proszę poczekać na przeniesienie logów..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Motyw"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "nazwa motywu"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Nie możesz skasować obecnie używanego motywu"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Ustaw najpierw inny motyw"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Rozmowa prywatna"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się."
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Nie jesteś już w pokoju \"%s\" lub \"%s\" wyszedł."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Pokój"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Czaty"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Ten pokój nie ma tematu"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s został zabanowany przez %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s występuje teraz jako %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr "%s dołączył do pokoju"
 
 #. No status message
-#: ../src/groupchat_control.py:904
-#: ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s ma teraz status %s"
 
-#: ../src/groupchat_control.py:1022
-#: ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Pseudonim nie został odnaleziony: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Ten pokój nie ma tematu"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073
-#: ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nie wygląda na poprawny JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Nie ma takiego polecenia: /%s (jeśli chcesz je wysłać, poprzedź je znakami: /say)"
+msgstr ""
+"Nie ma takiego polecenia: /%s (jeśli chcesz je wysłać, poprzedź je znakami: /"
+"say)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Polecenia: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the room, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "Użycie: /%s <pseudonim|JID> [powód] banuje JID w pokoju. Pseudonim osoby może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
+"of an occupant may be substituted, but not if it contains \"@\". If the JID "
+"is currently in the room, he/she/it will also be kicked. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Użycie: /%s <pseudonim|JID> [powód] banuje JID w pokoju. Pseudonim osoby "
+"może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w "
+"pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr "Użycie: /%s <pseudonim> otwiera okno prywatnej rozmowy z tą osobą."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Użycie: /%s czyście okno tekstowe."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, jeśli został podany."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, jeśli "
+"został podany."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Użycie: /%s ukrywa przyciski czatu."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current room, optionally providing a reason."
-msgstr "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie wyświetlając powód."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"providing a reason."
+msgstr ""
+"Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
+"wyświetlając powód."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do pokój@serwer opcjonalnie z wykorzystaniem podanego psedonimu."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do "
+"pokój@serwer opcjonalnie z wykorzystaniem podanego psedonimu."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the room and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie."
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the room and optionally displays a reason. Does NOT support spaces in "
+"nickname."
+msgstr ""
+"Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z "
+"pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current room. Use third person. (e.g. /%s explodes.)"
-msgstr "Użycie: /%s <działanie> wysyła działanie do aktualnego pokoju. Używaj w trzeciej osobie (np. /%s eksploduje.)"
+msgid ""
+"Usage: /%s <action>, sends action to the current room. Use third person. (e."
+"g. /%s explodes.)"
+msgstr ""
+"Użycie: /%s <działanie> wysyła działanie do aktualnego pokoju. Używaj w "
+"trzeciej osobie (np. /%s eksploduje.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message windowand sends message to the occupant specified by nickname."
-msgstr "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i wysyła ją do osoby o takim pseudonimie."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
+"wysyła ją do osoby o takim pseudonimie."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Użycie: /%s [temat] wyświetla lub aktualizuje temat aktualnego pokoju."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Użycie: /%s <wiadomość> wysyła wiadomość bez sprawdzania innych poleceń."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Użycie: /%s <wiadomość> wysyła wiadomość bez sprawdzania innych poleceń."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Brak informacji o pomocy dla /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Jeśli zamkniesz to okno, to połączenie z tym pokojem zostanie zerwane."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie."
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Możesz zarządzać zakładkami poprzez menu Działania w oknie kontaktów."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:1501
-#: ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Wykryto błąd programistyczny"
 
-#: ../src/gtkexcepthook.py:52
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Nie jest prawdopodnie krytyczny, ale powinien zostać mimo to zgłoszony deweloperom."
+#: ../src/gtkexcepthook.py:42
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Nie jest prawdopodnie krytyczny, ale powinien zostać mimo to zgłoszony "
+"deweloperom."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Zgłoś Błąd"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Szczegóły"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154
-#: ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Błąd odczytu pliku:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Błąd przetwarzania pliku:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
-msgstr "Nie można zapisywać do %s. Wsparcie dla Menadżera Sesji nie będzie działać."
+msgstr ""
+"Nie można zapisywać do %s. Wsparcie dla Menadżera Sesji nie będzie działać."
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr "Rozszerzenie nie jest obsługiwane"
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Obraz nie może zostać zapisany w formacie %(type)s. Zapisać jako %(new_filename)s?"
+msgstr ""
+"Obraz nie może zostać zapisany w formacie %(type)s. Zapisać jako %"
+"(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 msgid "Save Image as..."
 msgstr "Zapisz plik jako..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Nie można odnaleźć bazy danych z historią rozmów"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Kontakty"
 
 #. holds time
-#: ../src/history_manager.py:117
-#: ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:123
-#: ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Pseudonim"
 
 #. holds message
-#: ../src/history_manager.py:131
-#: ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Wiadomość"
 
 #. holds subject
-#: ../src/history_manager.py:138
-#: ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Temat"
 
-#: ../src/history_manager.py:183
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Czy chcesz wyczyścić bazę danych? (STANOWCZO ODRADZA SIĘ KORZYSTANIE Z TEJ OPCJI GDY GAJIM JEST URUCHOMIONY)"
+#: ../src/history_manager.py:182
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Czy chcesz wyczyścić bazę danych? (STANOWCZO ODRADZA SIĘ KORZYSTANIE Z TEJ "
+"OPCJI GDY GAJIM JEST URUCHOMIONY)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Standardowo baza danych przechowująca logi rozmów nie zminiejsza swojego rozmiaru - usunięte elementy zwalniają po prostu miejsce dla nowych danych. Jeżeli naprawdę chcesz zminejszyć rozmiar bazy danych kliknij TAK, w przeciwnym wypadku wybierz NIE.\n"
+"Standardowo baza danych przechowująca logi rozmów nie zminiejsza swojego "
+"rozmiaru - usunięte elementy zwalniają po prostu miejsce dla nowych danych. "
+"Jeżeli naprawdę chcesz zminejszyć rozmiar bazy danych kliknij TAK, w "
+"przeciwnym wypadku wybierz NIE.\n"
 "\n"
 "Jeżeli kliknąłeś TAK, musisz teraz poczekać..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Przenoszenie logów rozmów..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s o godzinie %(time)s napisał: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "kto"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Czy na pewno chcesz usunąć historię rozmów wybranego kontaktu?"
 msgstr[1] "Czy na pewno chcesz usunąć historię rozmów wybranych kontaktów?"
 msgstr[2] "Czy na pewno chcesz usunąć historię rozmów wybranych kontaktów?"
 
-#: ../src/history_manager.py:509
-#: ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Skutków tej operacji nie można będzie wycofać."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Czy na pewno chcesz usunąć wybraną wiadomość?"
 msgstr[1] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 msgstr[2] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 
-#: ../src/history_window.py:102
-#: ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historia rozmowy z %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s·jes teraz·%(status)s:·%(status_msg)s"
 
-#: ../src/history_window.py:262
-#: ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ma teraz status %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Obecny status: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Wiadomości"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmienił status"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s połączył(a) się"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s rozłączył(a) się"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Nowa wiadomość prywatna z pokoju %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Nie można załadować obrazka."
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Zaproszenie Odebrane"
+
+#: ../src/profile_window.py:315
+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/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "Publikacja vCard nie powiodła się"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
+"później."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Musisz być połączony by uzyskać informacje o kontakcie."
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:288
-#: ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Obserwatorzy"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Już jesteś w pokoju %s"
-
-#: ../src/roster_window.py:548
-#: ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
@@ -4159,318 +4714,336 @@ msgstr "używając konta %s"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763
-#: ../src/systray.py:193
-#: ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Zarządzaj zakładkami..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Menedżer historii rozmów"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Dołącz do nowego pokoju"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Dołącz do pokoju"
+
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Masz nieprzeczytane wiadomości"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr ""
+"Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:1159
-msgid "You will no longer be able to send and receive messages to contacts from this transport."
-msgstr "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą tego transportu."
+#: ../src/roster_window.py:1263
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
+msgstr ""
+"Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
+"tego transportu."
+
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Transport \"%s\" zostanie usunięty"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
+"tego transportu."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Nowy pokój"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "_Zmień nazwę"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Połącz"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "R_ozłącz"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Zmień Opis Statusu"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana."
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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."
+msgstr ""
+"Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej "
+"status."
 
-#: ../src/roster_window.py:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, 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:1822
+#: ../src/roster_window.py:2325
 #, 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:1826
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Usuwając kontakt cofniesz mu również autoryzację, co spowoduje, że kontakt będzie zawsze widział Cię jako rozłączonego."
+#: ../src/roster_window.py:2329
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Usuwając kontakt cofniesz mu również autoryzację, co spowoduje, że kontakt "
+"będzie zawsze widział Cię jako rozłączonego."
 
-#: ../src/roster_window.py:1830
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt będzie zawsze widział Cię jako rozłączonego."
+#: ../src/roster_window.py:2333
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
+"będzie zawsze widział Cię jako rozłączonego."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Kontakt \"%s\" zostanie usunięty z Twojej listy kontaktów."
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Usuwając kontakt cofniesz mu również autoryzację, co spowoduje, że kontakt "
+"będzie zawsze widział Cię jako rozłączonego."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Wpisz hasło GPG dla konta %s"
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Zapisz hasło"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Błędne hasło"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Proszę ponownie wprowadzić swoje hało GPH lub kliknąć przycisk Anuluj."
 
-#: ../src/roster_window.py:1963
-#: ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:1964
-#: ../src/roster_window.py:2021
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na pewno chcesz stać się niewidoczny?"
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
+"pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 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:2452
-#: ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Masz nieprzeczytane wiadomości"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453
-#: ../src/roster_window.py:2459
-msgid "Messages will only be available for reading them later if you have history enabled."
-msgstr "Wiadomości będą dostępne tylko do czytania, o ile masz włączoną obsługę historii."
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
+msgstr ""
+"Wiadomości będą dostępne tylko do czytania, o ile masz włączoną obsługę "
+"historii."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Usuń %s z grupy %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Przekształć %s oraz %s w metakontakty"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Zmień Opis Statusu..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Zmień Opis Statusu..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Ukryj to menu"
-
-#: ../src/systraywin32.py:261
-#: ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d nieprzeczytana wiadomość"
-msgstr[1] "Gajim - %d nieprzeczytane wiadomości"
-msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
-
-#: ../src/tooltips.py:326
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d nieprzeczytana wiadomość"
-msgstr[1] "%d nieprzeczytane wiadomości"
-msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
-
-#: ../src/tooltips.py:332
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d nieprzeczytana wiadomość"
-msgstr[1] "%d nieprzeczytane wiadomości"
-msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
-
-#: ../src/tooltips.py:338
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d nieprzeczytana wiadomość z czatu"
-msgstr[1] "%d nieprzeczytane wiadomości z czatu"
-msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
-
-#: ../src/tooltips.py:344
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d nieprzeczytana wiadomość prywatna"
-msgstr[1] "%d nieprzeczytane wiadomości prywatne"
-msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
-
-#: ../src/tooltips.py:359
-#: ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Funkcja: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Afiliacja: "
 
-#: ../src/tooltips.py:398
-#: ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Zasoby: "
 
-#: ../src/tooltips.py:407
-#: ../src/tooltips.py:540
-#: ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Status: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Autoryzacja: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Ostatni status %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Od %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "od %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Pobieranie"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Prześlij"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Przesłane: "
 
-#: ../src/tooltips.py:654
-#: ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Nie włączony"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../src/tooltips.py:660
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Ukończony"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Wygaszony"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Przesyłanie"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Ta usługa nie odesłała jeszcze szczegółowych informacji"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4478,77 +5051,73 @@ msgstr ""
 "Ta usługa nie była w stanie odesłać szczegółowych informacji.\n"
 "Prawdopodobnie została zamknięta lub jest zepsuta"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Nie można załadować obrazka."
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:332
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie interesujesz się jego/jej statusem."
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Afiliacja: "
 
-#: ../src/vcard.py:334
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie jest zainteresowana twoim."
+#: ../src/vcard.py:265
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
+"interesujesz się jego/jej statusem."
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:267
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
+"jest zainteresowana twoim."
+
+#: ../src/vcard.py:269
 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:338
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie jest zainteresowany twoim"
+#: ../src/vcard.py:271
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
+"jest zainteresowany twoim"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 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:359
-#: ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
-#: ../src/vcard.py:458
-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:491
-msgid "Without a connection, you can not get your contact information."
-msgstr "Musisz być połączony by uzyskać informacje o kontakcie."
-
-#: ../src/vcard.py:495
-msgid "Personal details"
-msgstr "Informacje osobiste"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "tworzenie bazy danych z logami"
 
-#: ../src/common/check_paths.py:82
-#: ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
 #: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s jest plikiem choć powinien być katalogiem"
 
-#: ../src/common/check_paths.py:83
-#: ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
 msgid "Gajim will now exit"
 msgstr "Gajim zakończy teraz działanie"
 
@@ -4562,407 +5131,718 @@ msgstr "%s jest katalogiem choć powinien być plikiem"
 msgid "creating %s directory"
 msgstr "tworzenie katalogu %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "Nie znaleziono biblioteki pysqlite2 (lub python-pysqlite2). Kończenie pracy programu..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Usługa nie jest dostępna. Gajim nie działa lub remote_control ma wartość False"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus nie jest obecny na tej maszynie lub brak modułu dla pythona"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Nie znaleziono interfejsu DBus.\n"
-"Zapoznaj się z uwagami na stronie http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Korzystaj z DBus i Demona Powiadomień aby wyświetlać powiadomienia"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
-msgstr "Czas w minutach, po którym twój status zostanie zmieniona na Zaraz wracam."
+msgstr ""
+"Czas w minutach, po którym twój status zostanie zmieniona na Zaraz wracam."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Status Zaraz wracam z powodu bezczynności programu"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
-msgstr "Czas w minutach, po którym twój status zostanie zmieniony na Niedostępny."
+msgstr ""
+"Czas w minutach, po którym twój status zostanie zmieniony na Niedostępny."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Status Nieobecny z powodu bezczynności programu"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+#, fuzzy
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (oddzielona spacjami) kolumn (kont lub grup), które są zwinięte"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 "'always' - wyświetlaj czas każdej wiadomości.\n"
-"'sometmes' - czas wyświetlany jest w odstępach zdefiniowanych w zmiennej print_ichat_every_foo_minutes.\n"
+"'sometmes' - czas wyświetlany jest w odstępach zdefiniowanych w zmiennej "
+"print_ichat_every_foo_minutes.\n"
 "'never' - nigdy nie wyświetlaj czasu."
 
-#: ../src/common/config.py:84
-msgid "Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one."
-msgstr "Wartość \"niedokładności\" od 1 do 4 (0 wyłącza \"okołozegarek\" [fuzzyclock]). 1 oznacza najbardziej precyzyjne wskazania zegara, 4 najmniej dokładne."
+#: ../src/common/config.py:90
+#, fuzzy
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Wartość \"niedokładności\" od 1 do 4 (0 wyłącza \"okołozegarek"
+"\" [fuzzyclock]). 1 oznacza najbardziej precyzyjne wskazania zegara, 4 "
+"najmniej dokładne."
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znaków * / _ jako znaki formatujące."
 
-#: ../src/common/config.py:88
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Jeśli ma wartość True, to */_ nie będą usuwane. Zatem napis *abc* będzie pogrubiony ale bez usuniętych znaków * *."
+#: ../src/common/config.py:94
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Jeśli ma wartość True, to */_ nie będą usuwane. Zatem napis *abc* będzie "
+"pogrubiony ale bez usuniętych znaków * *."
 
-#: ../src/common/config.py:98
-msgid "Character to add after nickname when using nick completion (tab) in group chat"
-msgstr "Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko czat)"
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
 
-#: ../src/common/config.py:99
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat"
-msgstr "Znak proponowany do dodania do nicka w sytuacji, gdy dany nick jest już używany przez innego uzytkownika czatu"
+#: ../src/common/config.py:106
+#, fuzzy
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko "
+"czat)"
+
+#: ../src/common/config.py:107
+#, fuzzy
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Znak proponowany do dodania do nicka w sytuacji, gdy dany nick jest już "
+"używany przez innego uzytkownika czatu"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Dodać * i [n] do tytułu listy kontaktów?"
 
-#: ../src/common/config.py:132
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta rozmowy zostanie ponownie otwarta."
+#: ../src/common/config.py:141
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta "
+"rozmowy zostanie ponownie otwarta."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Ile minut powinny być widoczne linie z poprzedniej rozmowy."
 
-#: ../src/common/config.py:134
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne zachowanie klienta Mirabilis ICQ)."
+#: ../src/common/config.py:143
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne "
+"zachowanie klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ile przechwywać linii dla kombinacji Ctrl+KeyUP."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Albo własny url zawierający %s, gdzie %s jest słowem/frazą, albo WIKTIONARY, co oznacza użycie wiktionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Albo własny url zawierający %s, gdzie %s jest słowem/frazą, albo WIKTIONARY, "
+"co oznacza użycie wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Jeśli ta opcja jest zaznaczona, to Gajim będzie mógł być sterowany zdalnie z wykorzystaniem gajim-remote."
+msgstr ""
+"Jeśli ta opcja jest zaznaczona, to Gajim będzie mógł być sterowany zdalnie z "
+"wykorzystaniem gajim-remote."
 
-#: ../src/common/config.py:145
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes"
-msgstr "W przypadku wybrania wyświetlania czasu nie dla każdej wiadomości (print_time==czasami), zmienna określa co ile minut Gajim ma wyświetlać czas nadejścia nowej wiadomości"
+#: ../src/common/config.py:154
+#, fuzzy
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"W przypadku wybrania wyświetlania czasu nie dla każdej wiadomości "
+"(print_time==czasami), zmienna określa co ile minut Gajim ma wyświetlać czas "
+"nadejścia nowej wiadomości"
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: ../src/common/config.py:147
-msgid "Always ask before closing group chat tab/window in this space separated list of room jids."
-msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej, która prowadzona jest na każdym z pokojów wymienionych na liście."
+#: ../src/common/config.py:156
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of room jids."
+msgstr ""
+"Zapytaj przed zamknięciem karty/okna rozmowy grupowej, która prowadzona jest "
+"na każdym z pokojów wymienionych na liście."
 
-#: ../src/common/config.py:148
-msgid "Never ask before closing group chat tab/window in this space separated list of room jids."
-msgstr "Nigdy nie przytak przed zamknięciem karty/okna rozmowy grupowej, która prowadzona jest na dowolnym pokoju obecnym na tej liście."
+#: ../src/common/config.py:157
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of room jids."
+msgstr ""
+"Nigdy nie przytak przed zamknięciem karty/okna rozmowy grupowej, która "
+"prowadzona jest na dowolnym pokoju obecnym na tej liście."
 
-#: ../src/common/config.py:151
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Nadpisuje host, który wysyłamy w celu przesyłania plików, w przypadku tłumaczenia adresu/przekierowania portu."
+#: ../src/common/config.py:160
+msgid ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+msgstr ""
+"Nadpisuje host, który wysyłamy w celu przesyłania plików, w przypadku "
+"tłumaczenia adresu/przekierowania portu."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Standard IEC mówi, że KiB = 1024 bajty, KB = 100 bajtów."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Czy pokazywać kartę gdy otwarta jest tylko jedna rozmowa?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Czy pokazywać rozgraniczenie kart w oknie czatu?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: ../src/common/config.py:176
-msgid "A semicolon-separated list of words that will be highlighted in multi-user chat."
-msgstr "Lista słów oddzielonych dwukropkami, które będą podświetlane w trakcie rozmowy w pokoju."
+#: ../src/common/config.py:185
+msgid ""
+"A semicolon-separated list of words that will be highlighted in multi-user "
+"chat."
+msgstr ""
+"Lista słów oddzielonych dwukropkami, które będą podświetlane w trakcie "
+"rozmowy w pokoju."
 
-#: ../src/common/config.py:177
-msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used."
-msgstr "Jeśli ma wartość True, to Gajim jest zamykany po wciśnięciu przycisku X Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka systemowa."
+#: ../src/common/config.py:186
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"Jeśli ma wartość True, to Gajim jest zamykany po wciśnięciu przycisku X "
+"Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
+"systemowa."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
-msgstr "Jeśli ma wartość True, Gajim rejestruje się przy każdym starcie jako klient xmpp://."
+msgstr ""
+"Jeśli ma wartość True, Gajim rejestruje się przy każdym starcie jako klient "
+"xmpp://."
 
-#: ../src/common/config.py:179
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Jeśli ma wartość True, Gajim wyświetli ikonę na każdej karcie zawierającej nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od motywu."
+#: ../src/common/config.py:188
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Jeśli ma wartość True, Gajim wyświetli ikonę na każdej karcie zawierającej "
+"nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
+"motywu."
 
-#: ../src/common/config.py:180
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window"
-msgstr "Jeśli ma wartość True, Gajim wyświetli opis statusu, jeśli nie jest on pusty, dla każdego kontaktu pod jego nazwą w oknie listy kontaktów."
+#: ../src/common/config.py:189
+#, fuzzy
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Jeśli ma wartość True, Gajim wyświetli opis statusu, jeśli nie jest on "
+"pusty, dla każdego kontaktu pod jego nazwą w oknie listy kontaktów."
 
-#: ../src/common/config.py:182
-msgid "If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old."
-msgstr "Jeśli ma wartość True, Gajim wyśle zapytanie o awatar każdego kontaktu, który ostatnio nie miał awatara lub ma zapisany jedynie stary."
+#: ../src/common/config.py:191
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"Jeśli ma wartość True, Gajim wyśle zapytanie o awatar każdego kontaktu, "
+"który ostatnio nie miał awatara lub ma zapisany jedynie stary."
 
-#: ../src/common/config.py:183
-msgid "If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message."
-msgstr "Jeśli ma wartość False, to nie będziesz informowany o zmianie statusu lub opisu statusu przez kontakt, z którym rozmawiasz."
+#: ../src/common/config.py:192
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"Jeśli ma wartość False, to nie będziesz informowany o zmianie statusu lub "
+"opisu statusu przez kontakt, z którym rozmawiasz."
 
-#: ../src/common/config.py:184
-msgid "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If \"all\" Gajim will print all status messages. If \"in_and_out\", gajim will only print FOO enters/leaves room"
-msgstr "Zmienna przybiera wartości \"none\", \"all\" oraz \"in_and_out\". W przypadku ustawienia \"none\", Gajim nie będzie już powiadamiał o zmianie statusu (lub opisu stanu) przez innego użytkownika czatu. \"all\" spowoduje wyświetlanie wszystkich wiadomości o statusie każdego użytkownika. Wybranie \"in_and_out\" nakazuje programowi wyświetlanie jedynie informacji o wejściu użytkownika do pokoju lub jego opuszczeniu"
+#: ../src/common/config.py:193
+#, fuzzy
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
+"room."
+msgstr ""
+"Zmienna przybiera wartości \"none\", \"all\" oraz \"in_and_out\". W "
+"przypadku ustawienia \"none\", Gajim nie będzie już powiadamiał o zmianie "
+"statusu (lub opisu stanu) przez innego użytkownika czatu. \"all\" spowoduje "
+"wyświetlanie wszystkich wiadomości o statusie każdego użytkownika. Wybranie "
+"\"in_and_out\" nakazuje programowi wyświetlanie jedynie informacji o wejściu "
+"użytkownika do pokoju lub jego opuszczeniu"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pokazuj awatarów transportów."
 
-#: ../src/common/config.py:189
-msgid "If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events."
-msgstr "Jeżeli opcja ta jest aktywna oraz zainstalowano GTK+ i PyGTK w wersji nie niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie okna programu."
+#: ../src/common/config.py:198
+#, fuzzy
+msgid "Don't show roster in the system taskbar."
+msgstr "Nie pokazuj awatarów transportów."
 
-#: ../src/common/config.py:191
-msgid "Jabberd1.4 does not like sha info when one join a password protected room. Turn this option to False to stop sending sha info in groupchat presences"
-msgstr "Demon Jabberd1.4 nie toleruje wysyłania \"sha info\" podczas wchodzenia do pokoju chronionego hasłem. Ustaw tą opcję na False aby zabronić Gajimowi wysyłania takiej informacji."
+#: ../src/common/config.py:199
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"Jeżeli opcja ta jest aktywna oraz zainstalowano GTK+ i PyGTK w wersji nie "
+"niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie "
+"okna programu."
+
+#: ../src/common/config.py:201
+#, fuzzy
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected room. "
+"Turn this option to False to stop sending sha info in group chat presences."
+msgstr ""
+"Demon Jabberd1.4 nie toleruje wysyłania \"sha info\" podczas wchodzenia do "
+"pokoju chronionego hasłem. Ustaw tą opcję na False aby zabronić Gajimowi "
+"wysyłania takiej informacji."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window. Note, changing this option requires restarting Gajim before the changes will take effect"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect."
 msgstr ""
 "Kontolruje zachowanie okna z nowymi wiadomościami.\n"
 "'zawsze' - wszystkie wiadomości wysyłane są do tego samego okna.\n"
 "'nigdy' - każda z wiadomości otrzymuje swoje własne okno.\n"
 "'Według kont' - wiadomości dla każdego z kont mają wspólne okno.\n"
-"'Według typu' - wiadomości określonego typu (np. czat czy czat grupowy) mają wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie uruchomić program."
+"'Według typu' - wiadomości określonego typu (np. czat czy czat grupowy) mają "
+"wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie "
+"uruchomić program."
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
-msgstr "Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w oknie rozmowy."
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr ""
+"Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w "
+"oknie rozmowy."
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
-msgstr "Ustawienie 'True' spowoduje zamykanie okna/karty rozmowy po naciśnięciu klawisza ESC."
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr ""
+"Ustawienie 'True' spowoduje zamykanie okna/karty rozmowy po naciśnięciu "
+"klawisza ESC."
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Ukrywa przyciski w oknie czatu"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Ukrywa przyciski podczas rozmowy dwóch osób."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Ukrywa banner w oknie czatu"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Usuwa banner podczas rozmowy dwóch osób."
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "Usuwa z okna rozmowy grupowej listę osób obecnych w pokoju."
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+#, fuzzy
+msgid "Merge consecutive nickname in chat window."
 msgstr "Łącz następujące po sobie te same nicki w oknie czata"
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Indentation when using merge consecutive nickame."
 msgstr "Wcięcie stosowane przy łaczeniu tych samych nicków"
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+#, fuzzy
+msgid "List of colors that will be used to color nicknames in group chats."
 msgstr "Lista kolorów, które używane będą do kolorowania nicków w oknach czatu"
 
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Obejście dla Jabberd2"
 
-#: ../src/common/config.py:241
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Jeżeli ta opcja jest aktywna, Gajim pobierze adresy serwerów proxy z klucza file_transfers_proxies i użyje ich podczas przesyłania plików."
+#: ../src/common/config.py:259
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Jeżeli ta opcja jest aktywna, Gajim pobierze adresy serwerów proxy z klucza "
+"file_transfers_proxies i użyje ich podczas przesyłania plików."
+
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Nie można używać OpenPGP na tym komputerze"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:312
-msgid "Sound to play when a MUC message contains one of the words in muc_highlight_words, or when a MUC message contains your nickname."
-msgstr "Dźwięk, który zostanie odtworzony, gdy wiadomość MUC będzie zawierać jeden z wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać będzie twój pseudonim."
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Dostępny"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Chętny do rozmowy"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Nieobecny"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
 
-#: ../src/common/config.py:313
-msgid "Sound to play when any MUC message arrives. (This setting is taken into account only if notify_on_all_muc_messages is True)"
-msgstr "Dźwięk, który zostanie odtworzony, gdy nadejdzie wiadomość MUC. (Ta opcja jest brana pod uwagę jedynie gdy zmienna notify_on_all_muc_messages ma wartość True)"
+#: ../src/common/config.py:367
+msgid ""
+"Sound to play when a MUC message contains one of the words in "
+"muc_highlight_words, or when a MUC message contains your nickname."
+msgstr ""
+"Dźwięk, który zostanie odtworzony, gdy wiadomość MUC będzie zawierać jeden z "
+"wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
+"będzie twój pseudonim."
 
-#: ../src/common/config.py:321
-#: ../src/common/optparser.py:185
+#: ../src/common/config.py:368
+msgid ""
+"Sound to play when any MUC message arrives. (This setting is taken into "
+"account only if notify_on_all_muc_messages is True)"
+msgstr ""
+"Dźwięk, który zostanie odtworzony, gdy nadejdzie wiadomość MUC. (Ta opcja "
+"jest brana pod uwagę jedynie gdy zmienna notify_on_all_muc_messages ma "
+"wartość True)"
+
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:325
-#: ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "morski"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr "Nie można załadować modułu idle"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Błędne hasło"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Informacje rejestracyjne transportu %s nie dotarły na czas"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Pseudonim nie został odnaleziony: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Nie można dołączyć do pokoju"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Aby dołączyć do tego pokoju, wymagane jest hasło."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Zostałeś zabanowany w tym pokoju."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Taki pokój nie istnieje."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "Tworzenie pokoi jest ograniczone."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Twój zarejestrowany pseudonim musi być w użyciu."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Nie jesteś na liście członków."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Pożądany przez ciebie pseudonim jest używany lub zarejestrowany przez kogoś "
+"innego.\n"
+"Podaj inny pseudonim:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Chciałbym dodać Cię do listy kontaktów."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "Zapisaliśmy się do %s"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Prośba o cofnięcie autoryzacji od %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "Wypisaliśmy się z %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Jid %s nie jest kompatybilny z RFC. Nie zostanie dodany do listy kontaktów. "
+"Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru."
+"jabberstudio.org/ aby go usunąć."
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Aby dalej wysyłać i odbierać wiadomości musisz się ponownie połączyć."
 
-#: ../src/common/connection.py:185
-#: ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Transport %s udzielił nieprawidłowej odpowiedzi na żądnie rejestracji."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Niepoprawna odpowiedź"
 
-#: ../src/common/connection.py:397
-#: ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Połączony z serwerem %s: %s z %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Sprawdź swoje połączenie lub spróbuj później"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Spawdź czy twój login i hasło są poprawne."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "Nie podano klucza OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "Niewidoczny"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "Rozłączony"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Jestem %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4971,293 +5851,566 @@ msgstr ""
 "Temat: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795
-#: ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Chciałbym dodać Cię do listy kontaktów."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
-msgid "Unable to load idle module"
-msgstr "Nie można załadować modułu idle"
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Na tym komputerze brakuje pythonowych dowiązań do D-Bus."
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Informacje rejestracyjne transportu %s nie dotarły na czas"
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Nie można użyć D-Bus."
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Nie można dołączyć do pokoju"
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
+"Nie znaleziono biblioteki pysqlite2 (lub python-pysqlite2). Kończenie pracy "
+"programu..."
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Aby dołączyć do tego pokoju, wymagane jest hasło."
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Usługa nie jest dostępna. Gajim nie działa lub remote_control ma wartość "
+"False"
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Zostałeś zabanowany w tym pokoju."
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus nie jest obecny na tej maszynie lub brak modułu dla pythona"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Taki pokój nie istnieje."
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Nie znaleziono interfejsu DBus.\n"
+"Zapoznaj się z uwagami na stronie http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "Tworzenie pokoi jest ograniczone."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Żaden"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Twój zarejestrowany pseudonim musi być w użyciu."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "kto"
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Nie jesteś na liście członków."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Ulica:"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "dla "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "plik"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
 msgstr ""
-"Pożądany przez ciebie pseudonim jest używany lub zarejestrowany przez kogoś innego.\n"
-"Podaj inny pseudonim:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "Zapisaliśmy się do %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Zdarzenie"
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Prośba o cofnięcie autoryzacji od %s"
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "Wypisaliśmy się z %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Kontynuuj"
 
-#: ../src/common/connection_handlers.py:1680
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Usuń"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "Jid %s nie jest kompatybilny z RFC. Nie zostanie dodany do listy kontaktów. Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru.jabberstudio.org/ aby go usunąć."
+msgid "%0 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Zarejestruj na %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Praca"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Żaden"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Zdarzenie"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
 
-#: ../src/common/helpers.py:100
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Wymagany adres serwera."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s·GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s·GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s·MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s·MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s·KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s·KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s·B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Nieobecny"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Dostępny"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Zaraz wracam"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Do"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Obustronna"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Goście"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Gość"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Funkcja kontaktu w pokoju: Brak"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Właściciel"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrator"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Uczestnik"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "pisze wiadomość..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
+#: ../src/common/helpers.py:871
+#, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "%d nieprzeczytana wiadomość"
+msgstr[1] "%d nieprzeczytane wiadomości"
+msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
+#: ../src/common/helpers.py:877
+#, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "%d nieprzeczytana wiadomość"
+msgstr[1] "%d nieprzeczytane wiadomości"
+msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
+#: ../src/common/helpers.py:883
+#, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "%d nieprzeczytana wiadomość z czatu"
+msgstr[1] "%d nieprzeczytane wiadomości z czatu"
+msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
+#: ../src/common/helpers.py:889
+#, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "%d nieprzeczytana wiadomość prywatna"
+msgstr[1] "%d nieprzeczytane wiadomości prywatne"
+msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180
-#: ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "cyjan"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "tworzenie bazy danych z logami"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "dla konta %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Nie można załadować obrazka."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Nie można połączyć się z \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Ta wiadomość jest zaszyfrowana]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Autoryzuj"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Away "
+#~ msgstr "Zaraz wracam "
+
+#~ msgid "Down"
+#~ msgstr "W dół"
+
+#~ msgid "List of special notifications settings"
+#~ msgstr "Lista akcji dla powiadomień"
+
+#~ msgid "Not Available "
+#~ msgstr "Nieobecny "
+
+#~ msgid "Up"
+#~ msgstr "Do góry"
+
+#~ msgid "Default"
+#~ msgstr "Domyślny"
+
+#~ msgid "Create your own Privacy Lists"
+#~ msgstr "Stwórz własną listę prywatności"
+
+#~ msgid "Server-based Privacy Lists"
+#~ msgstr "Listy prywatności po stronie serwera"
+
+#~ msgid "Contact _Info"
+#~ msgstr "_Informacje o kontakcie"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informacje o kontakcie"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Niepoprawna nazwa pokoju lub serwera"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Nieznana wersja D-Bus: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "Publikacja vCard powiodła się"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Informacje o tobie zostały opublikowane."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Przenoszenie logów..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Proszę poczekać na przeniesienie logów..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Dołącz do nowego pokoju"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Ukryj to menu"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d nieprzeczytana wiadomość"
+#~ msgstr[1] "Gajim - %d nieprzeczytane wiadomości"
+#~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
+#~ msgid "Since %s"
+#~ msgstr "Od %s"
diff --git a/po/pt.po b/po/pt.po
index 90ee1dbbe..22236d00c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Gajim package.
 # 
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "Cliente Jabber GTK+"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr ""
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
 
@@ -42,16 +42,23 @@ msgid "_Discover Services..."
 msgstr "_Descobrir Recursos..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "C_hat"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modificar Conta..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Abrir Compositor de Email"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "E_stado"
 
@@ -106,7 +113,7 @@ msgid "Pass_word:"
 msgstr "_Senha:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Guardar _senha"
 
@@ -132,7 +139,7 @@ msgid "Your JID:"
 msgstr "O seu JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "Avançado"
 
@@ -146,7 +153,7 @@ msgid "_Host:"
 msgstr "_Host:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Senha:"
 
@@ -179,10 +186,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diversos</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Detalhes Pessoais</b>"
 
@@ -199,6 +208,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Religar automaticamente em caso de perda de ligação."
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "_Ligar ao arranque"
 
@@ -219,6 +229,7 @@ msgstr ""
 "esta opção marcada o TLS será desactivado."
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "_Escolha chave..."
 
@@ -235,16 +246,16 @@ msgid "Edit Personal Information..."
 msgstr "Editar Detalhes Pessoais..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Geral"
 
@@ -267,6 +278,7 @@ msgstr ""
 "ligação, os quais resultam na perda dessa ligação"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -275,6 +287,7 @@ msgstr ""
 "'leitura' apenas para si"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -283,6 +296,7 @@ msgstr ""
 "usando esta conta"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -299,18 +313,23 @@ msgstr "Informações sobre si, tal como estão gravadas no servidor"
 msgid "Manage..."
 msgstr "Gerir..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Nenhuma chave seleccionada"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Nenhum"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Detalhes Pessoais..."
 
@@ -333,14 +352,18 @@ msgstr ""
 "conta; O cliente com a maior prioridade receberá os eventos"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Re_curso: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -354,41 +377,47 @@ msgstr ""
 "recursos 'Casa' e 'Trabalho' ao mesmo tempo. O recurso com a maior "
 "prioridade receberá os eventos. (ver em baixo)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Guardar _frase de acesso (inseguro)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Guardar _históricos das conversas para todos os contactos"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes keep-alive"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar estado da conta com estado global"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (específica)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Usar hostname/porta personalizados"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 #, fuzzy
 msgid "Use file transfer proxies"
 msgstr "lista de transferências de ficheiros"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Nome: "
 
@@ -398,62 +427,91 @@ msgstr "Contas"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Se tem duas ou mais contas e esta opção for marcada, o Gajim listará todos "
 "os contactos como se tivesse apenas uma conta"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Fundir contas"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Remover"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Conta:"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Adicionar Novo Contacto"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Conta:"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Grupo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 msgid "_Nickname:"
 msgstr "_Alcunha:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protocolo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Subscrever"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Re_gistar"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "ID do Utilizador:"
@@ -543,82 +601,63 @@ msgstr "<b>Sons</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Endereço"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "Acções A_vançadas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Editor de Configuração Avançada"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Estado: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Ausente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Ocupado"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Download"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "comando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "<b>Notificações Visuais</b>"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Indisponível"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Livre para conversar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -631,75 +670,75 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Usar uma única janela de conversa com _abas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Mostrar apenas na _lista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Mostrar apenas na _lista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Porta:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -737,7 +776,7 @@ msgstr "_Entrar num Chat"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Adicionar à Lista"
 
@@ -758,7 +797,8 @@ msgid "_Open Link in Browser"
 msgstr "_Abrir Link no Navegador"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Iniciar Conversa"
@@ -768,7 +808,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Clique para ver conversas anteriores com este contacto"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Enviar _Ficheiro"
 
@@ -784,7 +825,8 @@ msgstr "Vista _Compacta    Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Histórico"
 
@@ -854,7 +896,7 @@ msgstr ""
 "Quando uma transferência de ficheiro é concluida, exibir um popup de "
 "notificação"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -891,66 +933,61 @@ msgstr ""
 "Banner"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Activo"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Estilo da letra:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Personalização de Temas do Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 #, fuzzy
 msgid "Gone"
 msgstr "Nenhum"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 #, fuzzy
 msgid "Inactive"
 msgstr "Activo"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 #, fuzzy
 msgid ""
 "MUC\n"
 "Messages"
 msgstr "Mensagem"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Pausada"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "_Cor do texto"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "_Letra do texto"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "Cor _de fundo"
 
@@ -1065,7 +1102,7 @@ msgid "Accept"
 msgstr "Aceitar"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Negar"
 
@@ -1073,13 +1110,14 @@ msgstr "Negar"
 msgid "Invitation Received"
 msgstr "Convite Recebido"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Alcunha:"
 
@@ -1097,13 +1135,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Servidor:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1128,6 +1161,10 @@ msgstr "Gerir Bookmarks"
 msgid "Print status:"
 msgstr "Mostrar hora:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Servidor:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Título:"
@@ -1149,7 +1186,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Gerir Perfis de Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1166,20 +1204,21 @@ msgstr "Usar autenticação"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Clique para inserir um emoticon (Alt+E)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "Encriptação OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Acções"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "E_nviar"
 
@@ -1255,18 +1294,25 @@ msgid "Also known as iChat style"
 msgstr "Conhecido também como estilo iChat"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Pedir a mensagem de estado quando eu me: "
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Marcar automaticamente como _ausente depois de:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Marcar automaticamente como _indisponível depois de:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1278,20 +1324,20 @@ msgstr ""
 "Usar sempre aplicações KDE padrão\n"
 "Personalizar"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid "B_efore nickname:"
 msgstr "Antes da alcunha:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1301,40 +1347,45 @@ msgstr ""
 "spammar/incomodar. Use com precaução, pois isto bloqueia todas as mensagens "
 "de qualquer contacto que não estiver na sua lista."
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Mensagem de Estado"
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default status _iconset:"
 msgstr "Iconset de _estados padrão:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Exibir mensagens de estado dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 #, fuzzy
 msgid "E_very 5 minutes"
 msgstr "De 5 em 5 _minutos"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Gerir Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Eventos"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1344,7 +1395,7 @@ msgstr ""
 "Gajim pode enviar e receber meta-informação relativa a uma conversa que "
 "esteja a ter com um contacto "
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -1352,7 +1403,7 @@ msgstr ""
 "Gajim exibirá automaticamente a nova mensagem recebida numa nova janela de "
 "conversa ou numa aba numa janela existente"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -1361,7 +1412,7 @@ msgstr ""
 "Gajim o notificará a cada nova mensagem através de um popup no canto "
 "inferior direito do ecrã"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1369,7 +1420,7 @@ msgstr ""
 "Gajim o notificará através de um popup no canto inferior direito do ecrã "
 "sobre os contactos que se ligarem"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1377,13 +1428,19 @@ msgstr ""
 "Gajim o notificará através de um popup no canto inferior direito do ecrã "
 "sobre os contactos que se desligarem"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim mudará apenas o ícone do contacto que enviou a nova mensagem"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -1392,7 +1449,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1401,7 +1458,7 @@ msgstr ""
 "Se marcado, Gajim exibirá as mensagens de estado dos contactos debaixo dos "
 "nomes de cada um na janela principal"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1409,7 +1466,7 @@ msgstr ""
 "Se marcado, o Gajim lembrar-se-á da posição da janela principal na próxima "
 "vez que for executado"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1419,7 +1476,7 @@ msgstr ""
 "(Por exemplo, um contacto do MSN terá o ícone msn equivalente para o estado "
 "disponível, ausente, ocupado, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -1428,12 +1485,12 @@ msgstr ""
 "Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
 "gráficos equivalentes."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Gerir..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1441,83 +1498,87 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "Em todas as _mensagens"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid "One message _window:"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Mostrar hora:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Guardar _posição e tamanho das janelas de conversa e lista de contactos"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Mostrar apenas na _lista"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_Ligar"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_Desligar"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "A mensagem de estado auto-ausente"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "A mensagem de estado auto-indisponível"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Usar iconsets de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -1530,160 +1591,169 @@ msgstr ""
 "NOTA: Eventos de nova mensagem recebida só ocorrem se for uma nova mensagem "
 "de um contacto com quem ainda não estiver a conversar."
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Quando um novo evento é recebido"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Editor de Configuração Avançada"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "_After time:"
 msgstr "Depois da hora:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 #, fuzzy
 msgid "_Before time:"
 msgstr "Antes da hora:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 #, fuzzy
 msgid "_File manager:"
 msgstr "Gestor de ficheiros:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 #, fuzzy
 msgid "_Font:"
 msgstr "Letra:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal soletradas"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar eventos de contactos que não estão na lista"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Mensagem recebida:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "Cliente de e_mail:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Notificar-me"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Mensagem a enviar:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Tocador de som:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Mostrar a mensagem como pop-up"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Voltar às Cores Padrão"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 #, fuzzy
 msgid "_Sort contacts by status"
 msgstr "Ordenar contactos por estados"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 #, fuzzy
 msgid "_Status message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minutos"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Iniciar Conversa"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "_Ligar ao arranque"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Apagar MOTD"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 msgid "Privacy List"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Subscrição"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "Neste grupo"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1691,32 +1761,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Enviar mensagem"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Sobre"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Endereço"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Definir _Avatar"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Aniversário"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Cidade:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Empresa:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "País:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Departamento:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Complemento:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Família:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Nome Dado:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Página pessoal:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Nome do meio:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Mais"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Detalhes Pessoais..."
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefone:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Cargo:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Código Postal:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Prefixo:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Função:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Estado:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Rua:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Sufixo:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Trabalho"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Publicar"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Recuperar"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1736,48 +1946,59 @@ msgid "A_sk to see his/her status"
 msgstr "Pedir para ver o estado dele/dela"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Notificações Visuais</b>"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Atribuir chave OpenPGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Enviar _Mensagem Simples"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Iniciar _Conversa"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Proibí-lo /-la de ver o meu estado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Remover da Lista"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Subscrição"
 
@@ -1802,42 +2023,53 @@ msgid "Help online"
 msgstr "Ajuda online"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Perfil, Avatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transportes"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Descobrir Recursos"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Sair"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Voz"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Ir"
@@ -1907,24 +2139,20 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorize o contacto para ele saber quando você está ligado"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "_Infos do Contacto"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Recusar autorização do contacto, para que ele não possa saber quando você "
 "está ligado"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Pedido de Subscrição"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Negar"
 
@@ -1940,164 +2168,51 @@ msgstr "Mostrar _Lista de Contactos"
 msgid "Sta_tus"
 msgstr "Es_tado"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Sobre"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Endereço"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Perguntar:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Aniversário"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Cidade:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Empresa:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Informações do Contacto"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "País:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Departamento:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Complemento:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Família:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Nome Dado:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Página pessoal:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Contacto:"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Morada"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Nome do meio:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Mais"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "SO:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Telefone:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Cargo:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Código Postal:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Prefixo:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Função:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Definir _Avatar"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Estado:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Rua:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Subscrição:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Sufixo:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Trabalho"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Histórico das Conversas"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Publicar"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Recuperar"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Tráfego Jabber</b>"
@@ -2129,30 +2244,165 @@ msgstr "_Mensagem"
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Nome:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Nome:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Detalhes Pessoais..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Modificar Conta..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Usar hostname/porta personalizados"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Nome Preferencial"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Nenhum)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Escondida"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Geral"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "green"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Morada"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Itálico"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Publicar"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2168,53 +2418,63 @@ msgstr ""
 "\n"
 "A função de destaque de palavras mal soletradas não será usada"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 #, fuzzy
 msgid "Chats"
 msgstr "Conversa"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s não emitiu uma chave OpenPGP nem você associou uma"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Encriptação activada"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Encriptação desactivada"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2222,277 +2482,322 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Todos os %s _minutos"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Activo"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Uma ligação não está disponível"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nome do Contacto"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto Entrou"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensagem"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 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:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sem ligação, não lhe é possível editar as suas informações pessoais."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "Deve primeiro criar sua conta antes de editar suas informações"
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Não tem nenhuma conta activa"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Nome de conta em uso"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2502,91 +2807,92 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nova Sala"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Chat"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, verifique se preencheu os campos servidor e sala ou remova este "
 "bookmark"
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2595,23 +2901,23 @@ msgstr ""
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2619,468 +2925,517 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde que prestou atenção a este "
 "chat pela última vez."
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta um \"%s\" no URL do Dicionário e como tal não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "Há %i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "Bindings do python D-Bus estão em falta neste computador"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contacto <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Nome do Contacto"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensagem de Estado de %s"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Endereço:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Endereço:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Complemento:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor preencha os dados do contacto que deseja adicionar na conta %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contacto que deseja adicionar"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "ID de Utilizador inválido"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Este serviço não contém quaisquer itens para explorar"
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "ID do Utilizador:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "Um cliente Jabber GTK+"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossível entrar na sala"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Pedido de subscrição para a conta %s por parte de %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Já está na sala %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat com a conta %s"
 
-#: ../src/dialogs.py:1030
+#: ../src/dialogs.py:1184
 #, fuzzy
-msgid "Invalid room or server name"
-msgstr "Nome de utilizador inválido"
+msgid "Invalid room Jabber ID"
+msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+msgid "The room Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Introduza o ID do contacto a quem gostaria\n"
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível escrever ficheiro em %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto Saiu"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
+msgstr "Mensagem Simples com a conta %s"
+
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Descrição: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Ligação"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Tem de estar ligado para ver os serviços"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviço usando conta %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3088,46 +3443,51 @@ msgstr ""
 "Não há serviço/recurso no endereço que introduziu, ou pelo menos não "
 "responde. Verifique o endereço e tente novamente."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Serviço não explorável"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de serviço/recurso não contém itens para explorar."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "usando a conta %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Este serviço não contém quaisquer itens para explorar"
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Buscando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Utilizadores"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Descrição"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Ficheiro"
@@ -3145,7 +3505,7 @@ msgstr "Progresso"
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
@@ -3153,17 +3513,17 @@ msgstr "Tamanho: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Destinatário: "
 
@@ -3184,79 +3544,89 @@ msgstr "Transferência de ficheiro cancelada"
 msgid "Connection with peer cannot be established."
 msgstr "Ligação ao peer não pode ser estabelecida."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Destinatário: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Introduza a sua mensagem :"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Transferência de ficheiro parada pelo contacto na outra ponta"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Escolher Ficheiro para Enviar"
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim não consegue aceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Este ficheiro está a ser usado por outro processo."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer enviar-lhe um ficheiro:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Guardar Ficheiro como..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3264,58 +3634,261 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Ficheiro Inválido"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim necesita do Xserver para ser executado. Saindo..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim necessita do PyGTK versão 2.6 ou acima"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr ""
+"Gajim necessita do PyGTK versão 2.6 ou acima para ser executado. Saindo..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim necessita do GTK versão 2.6 ou acima"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr ""
+"Gajim necessita do GTK versão 2.6 ou acima para ser executado. Saindo..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "Falta suporte libglade para o runtime GTK+"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Por favor remova o seu runtime GTK+ actual e instale a última versão estável "
+"de %s"
+
+#: ../src/gajim.py:65
+#, fuzzy
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Por favor, certifique-se de que o GTK e o PyGTK têm suporte libglade no seu "
+"sistema."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim necessita do PySQLite2 para ser executado"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim necessita do PySQLite2 para ser executado"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autorização para %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Aceita este pedido?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Ligação"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Assunto: %s\n"
+
+#: ../src/gajim.py:654
+#, fuzzy, python-format
+msgid "error while sending %s ( %s )"
+msgstr "erro ao enviar"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Autorização aceite"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "O contacto \"%s\" autorizou-o a ver o seu estado."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Contacto \"%s\" removeu a sua subscrição para si"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Vê-lo-á sempre como estando offline."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Contacto com \"%s\" não pode ser estabelecido"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Verifique a sua ligação ou tente novamente mais tarde."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s está agora  %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "A sua chave de acesso está incorrecta"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Está neste momento ligado sem a sua chave OpenPGP."
+
+#: ../src/gajim.py:1084
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Tem mensagens não lidas"
+msgstr[1] "Tem mensagens não lidas"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s quer enviar-lhe um ficheiro."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Recebeu com sucesso %(filename)s de %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Transferência de %(filename)s de %(name)s interrompida."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Enviou com sucesso %(filename)s para %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Transferência de %(filename)s para %(name)s interrompida."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Impossível salvar as suas definições e preferências"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "Session Management não é suportado (módulo gnome.ui em falta)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "Exibe ajuda acerca de um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "mostrar ajuda sobre comando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Abre uma janela com a próxima mensagem não lida"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3323,48 +3896,48 @@ msgstr ""
 "Mostra uma lista de todos os contactos na lista. Cada contacto aparece numa "
 "linha separada"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "mostrar apenas contactos da conta indicada"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Mostra uma lista de contas registadas"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Muda o estado de uma ou várias contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "um de: offline, disponível, livre para conversar, ausente, indisponível, "
 "ocupado, invisível"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "mensagem"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "mensagem de estado:"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3373,21 +3946,21 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Mostra uma caixa de conversa para que possa enviar mensagens a um contacto"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto com quem deseja conversar"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se especificado, o contacto é escolhido da lista de contactos desta conta"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3398,27 +3971,27 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se especificado, a mensagem será encriptada usando esta chave pública"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3429,110 +4002,110 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Assunto:"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Mensagem"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 #, fuzzy
 msgid "Name of the account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "Ficheiro"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Localização do ficheiro"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Exibe todas as preferências e os seus valores"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'chave' para 'valor'."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chave' é o nome da preferência, 'valor' é o valor da qual se pretende "
 "definir"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Apaga um item das preferências"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a apagar"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escreve o estado actual das preferências do Gajim para o ficheiro .config"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Adiciona o contacto à lista"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Adiciona um novo contacto nesta conta."
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
@@ -3540,25 +4113,40 @@ msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "Consola XML"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento em falta \"contacto_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3567,16 +4155,11 @@ msgstr ""
 "'%s' não está na sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Versão D-Bus desconhecida: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3585,16 +4168,16 @@ msgstr ""
 "Uso: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3603,7 +4186,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um de:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3612,338 +4195,138 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim necesita do Xserver para ser executado. Saindo..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim necessita do PyGTK versão 2.6 ou acima"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr ""
-"Gajim necessita do PyGTK versão 2.6 ou acima para ser executado. Saindo..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim necessita do GTK versão 2.6 ou acima"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr ""
-"Gajim necessita do GTK versão 2.6 ou acima para ser executado. Saindo..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Falta suporte libglade para o runtime GTK+"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Por favor remova o seu runtime GTK+ actual e instale a última versão estável "
-"de %s"
-
-#: ../src/gajim.py:65
-#, fuzzy
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Por favor, certifique-se de que o GTK e o PyGTK têm suporte libglade no seu "
-"sistema."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim necessita do PySQLite2 para ser executado"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autorização para %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Aceita este pedido?"
-
-#: ../src/gajim.py:611
-#, fuzzy, python-format
-msgid "error while sending %s ( %s )"
-msgstr "erro ao enviar"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Autorização aceite"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "O contacto \"%s\" autorizou-o a ver o seu estado."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Contacto \"%s\" removeu a sua subscrição para si"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Vê-lo-á sempre como estando offline."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Contacto com \"%s\" não pode ser estabelecido"
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Verifique a sua ligação ou tente novamente mais tarde."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s está agora  %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "A sua chave de acesso está incorrecta"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Está neste momento ligado sem a sua chave OpenPGP."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1035
-#, fuzzy, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Tem mensagens não lidas"
-msgstr[1] "Tem mensagens não lidas"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s quer enviar-lhe um ficheiro."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Recebeu com sucesso %(filename)s de %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Transferência de %(filename)s de %(name)s interrompida."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Enviou com sucesso %(filename)s para %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Transferência de %(filename)s para %(name)s interrompida."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "Publicação vCard deu-se com sucesso"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "As suas informações pessoais foram publicadas com sucesso."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "Publicação vCard falhou"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
-"mais tarde."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Impossível salvar as suas definições e preferências"
-
-#: ../src/gajim.py:1903
-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:1932
-msgid "Migrating Logs..."
-msgstr "Fazendo a 'migração' dos logs..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr ""
-"Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
-"feita "
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Não pode apagar o seu tema actual"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 #, fuzzy
 msgid "Private Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Já não se encontra na sala \"%s\" ou \"%s\" saiu."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Chat"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 #, fuzzy
 msgid "Group Chats"
 msgstr "Chat"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Esta sala não tem assunto"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi banido por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s está agora %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Esta sala não tem assunto"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s não parece ser um JID válido"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Comando inexistente: /%s (se desejar enviar isto, escreva primeiro /say)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3955,7 +4338,7 @@ msgstr ""
 "pode ser substituida, mas não se conter \"@\". Se o JID estiver neste "
 "momento na sala, este será também expulso. Não suporta espaços numa alcunha."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3963,12 +4346,12 @@ msgstr ""
 "Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3977,12 +4360,12 @@ msgstr ""
 "Uso: /%s [razão], fecha a janela ou aba actual, exibindo a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3991,7 +4374,7 @@ msgstr ""
 "Uso: /%s <JID> [razão], convida o JID para a sala actual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4000,7 +4383,7 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/alcunha], convida a juntar-se a sala@servidor, "
 "usando opcionalmente uma alcunha especificada."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4010,7 +4393,7 @@ msgstr ""
 "Uso: /%s <alcunha> [razão], remove o ocupante especificado pela alcunha da "
 "sala e opcionalmente exibe uma razão. Não suporta espaços na alcunha."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -4019,7 +4402,7 @@ msgstr ""
 "Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
 "pessoa. (Por exemplo, /%s explode.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4028,101 +4411,101 @@ msgstr ""
 "Uso: /%s <alcunha> [mensagem], abre uma janela de mensagem privada e envia "
 "uma mensagem ao ocupante da sala especificado pela alcunha."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Uso: /%s <alcunha>, muda a sua alcunha na sala actual."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uso: /%s <message>, envia uma mensagem sem procurar por outros comandos."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Não há informações de ajuda para /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Tem a certeza de que deseja sair da sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Se fechar esta janela, perder-se-á a ligação a esta sala."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Não voltar a perguntar"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Bookmark já está configurado"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos seus bookmarks."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Pode gerir os seus bookmarks pelo menu de Acções na sua janela."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Um erro de programação foi detectado"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4130,91 +4513,91 @@ msgstr ""
 "Provavelmente não se trata de um erro fatal, mas, ainda assim, os "
 "programadores deveriam ser informados."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Reportar Erro (Bug)"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Detalhes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Erro na interpretação (parsing) do ficheiro:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Impossível escrever para %s. Session Management não será suportado"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar Ficheiro como..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "a criar base de dados dos logs"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 #, fuzzy
 msgid "Contacts"
 msgstr "Contacto:"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 #, fuzzy
 msgid "Nickname"
 msgstr "Alcunha:"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Mensagem"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 #, fuzzy
 msgid "Subject"
 msgstr "Assunto:"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4223,134 +4606,177 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr ""
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversas com %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contacto Saiu"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Mensagem Instantânea"
 
-#: ../src/notify.py:150
+#: ../src/notify.py:234
 #, fuzzy, python-format
-msgid "New Private Message from room %s"
+msgid "New Private Message from group chat %s"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, fuzzy, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr ""
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Convite Recebido"
+
+#: ../src/profile_window.py:315
+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/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "Publicação vCard falhou"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
+"mais tarde."
+
+#: ../src/profile_window.py:381
+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/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Já está na sala %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Não pode entrar numa sala quando está invisível"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "para conta %s"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "usando conta %s"
@@ -4358,42 +4784,53 @@ msgstr "usando conta %s"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "usando a conta %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Gerir Bookmarks..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Juntar-se a uma Nova Sala"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "_Entrar num Chat"
+
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Tem mensagens não lidas"
+
+#: ../src/roster_window.py:1259
+msgid "You must read them before removing this transport."
+msgstr ""
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4401,67 +4838,86 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Transporte \"%s\" será removido"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Deixará de poder enviar e receber mensagens aos contactos desde este "
+"transport."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Nova Sala"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Ligar"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "_Desligar"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -4470,7 +4926,7 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4478,37 +4934,52 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Contacto \"%s\" será removido de sua lista"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
+"sempre como offline."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Guardar frase de acesso"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4516,164 +4987,131 @@ 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:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 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:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Tem mensagens não lidas"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 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:3231
+#: ../src/roster_window.py:3848
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De %s na sala %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Estado..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Esconder este menú"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d mensagem não lida"
-msgstr[1] "Gajim - %d mensagens não lidas"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d mensagem não lida"
-msgstr[1] "Gajim - %d mensagens não lidas"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d mensagem não lida"
-msgstr[1] "Gajim - %d mensagens não lidas"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d mensagem de chat não lida"
-msgstr[1] "Gajim - %d mensagens de chat não lidas"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d mensagem privada não lida"
-msgstr[1] "Gajim - %d mensagens privadas não lidas"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Função: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Filiação: "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Estado: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Subscrição:"
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Estado: "
+
+#: ../src/tooltips.py:484
 #, fuzzy, python-format
-msgid "Last status on %s"
+msgid "Last status: %s"
 msgstr "Iconset de _estados padrão:"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:486
 #, fuzzy, python-format
-msgid "Since %s"
-msgstr "Tamanho: %s"
+msgid " since %s"
+msgstr "Versão %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Não iniciada"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Parada"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Completa"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Interrompida"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço/recurso ainda não respondeu com informações detalhadas"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4681,25 +5119,25 @@ msgstr ""
 "Este serviço/recurso não pôde responder com informações detalhadas.\n"
 "Provavelmente está legacy ou broken"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr ""
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versão %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Filiação: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4707,7 +5145,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:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4715,41 +5153,27 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 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:338
+#: ../src/vcard.py:271
 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:347
+#: ../src/vcard.py:279
 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:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/vcard.py:458
-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:491
-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:495
-#, fuzzy
-msgid "Personal details"
-msgstr "Detalhes Pessoais..."
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "a criar base de dados dos logs"
 
@@ -4774,91 +5198,88 @@ msgstr "%s é um directório, mas deveria ser um ficheiro"
 msgid "creating %s directory"
 msgstr "a criar directório %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Serviço/Recurso indisponível: Gajim não está a correr, ou remote_control é "
-"False"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus não está presente nesta máquina, ou falta módulo python"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo, em minutos, após o qual o seu estado muda para Ausente."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Ausente por estar inactivo"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo, em minutos, após o qual o seu estado muda para Indisponível."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Indisponível por estar inactivo"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:88
+msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se Verdadeiro (True), não remover */_ . Para que *abc* fique em negrito "
 "(bold) mas * * não seja removido."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no título da lista de contactos?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4866,12 +5287,12 @@ msgstr ""
 "Número de linhas, da conversa anterior, a lembrar para quando uma janela/aba "
 "de conversa seja reaberta."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Número de minutos que as últimas linhas da conversa anterior devem durar."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4879,11 +5300,11 @@ msgstr ""
 "Enviar mensagem ao premir Ctrl+Enter e fazer nova linha com Enter "
 "(Comportamento por defeito do cliente ICQ Mirabilis)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Número de linhas a guardar ao premir Ctrl+TeclaCIMA."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4892,35 +5313,35 @@ msgstr ""
 "Ou um endereço URL personalizado contendo %s, onde %s é a palavra ou frase, "
 "ou 'WIKTIONARY', que significa que será usado o Wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se marcado, Gajim pode ser controlado à distância usando gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4928,24 +5349,24 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "O standart IEC diz: KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda da aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4953,7 +5374,7 @@ msgstr ""
 "Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
 "num chat de vários utilizadores."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4961,11 +5382,11 @@ msgstr ""
 "Se Verdadeiro (True), sai do Gajim quando o botão X do Window Manager for "
 "clicado. Esta definição só será aplicada se o trayicon estiver a ser usado."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Se Verdadeiro (True), Gajim registará para xmpp:// a cada arranque."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4973,15 +5394,16 @@ msgstr ""
 "Se Verdadeiro (True), Gajim mostrará um ícone em cada aba contendo mensagens "
 "não lidas. Dependendo do tema, este ícone poderá ser animado."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Se Verdadeiro (True), Gajim exibirá a mensagem de estado, caso houver, de "
 "cada contacto debaixo do nome de cada um deles na lista"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4989,7 +5411,7 @@ msgstr ""
 "Se Verdadeiro (True), Gajim perguntará por um avatar a cada contacto que não "
 "tinha um da última vez ou tenha um na memória cache há demasiado tempo."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4998,34 +5420,43 @@ msgstr ""
 "Se Falso (False), deixará de ver a linha de estados em conversas quando um "
 "contacto mudar de estado ou de mensagem de estado."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5033,115 +5464,174 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:207
 #, fuzzy
-msgid "Hides the buttons in group chat window"
+msgid "Hides the buttons in group chat window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
-msgstr ""
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Não é possível usar OpenPGP neste computador"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, por isso deixe-me uma mensagem"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "A trabalhar"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Estou fora, fui apreciar a vida"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Disponível"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Livre para conversar"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Serviço não disponível"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5149,7 +5639,7 @@ msgstr ""
 "Som a tocar quando uma mensagem de chat conter uma das palavras da lista "
 "muc_highlight_words, or quando uma mensagem conter a sua alcunha."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5157,98 +5647,210 @@ msgstr ""
 "Som a tocar quando uma mensagem de chat chegar. (Apenas aplicável se "
 "notify_on_all_muc_messages estiver definido como Verdadeiro)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Impossível entrar na sala"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Frase de acesso"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Informação de registo para o transport %s não chegou a tempo"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Alcunha não encontrada: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Impossível entrar na sala"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "É necessária uma palavra-passe para esta sala."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Está banido/a desta sala."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Tal sala não existe."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "Criação de salas encontra-se restrita."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "A sua alcunha registada tem de ser usada."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Não está na lista de membros."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
+"Por favor, introduza outra alcunha em baixo:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Eu gostaria de o adicionar à minha lista"
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "estamos agora subscritos a %s"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "pedido de remoção de subscrição por %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "já não estamos subscritos a %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s não é compatível com RFC. Não será adicionado à sua lista. Utilize "
+"ferramentas de gestão de lista (roster) tais como http://jru.jabberstudio."
+"org/ para o remover."
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar a enviar e receber mensagens, precisará de se reconectar."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Senha Inválida"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Ligado ao servidor %s:%s com %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Verifique a sua ligação ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique se o seu login e senha estão correctos."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "Palavra-chave do OpenPGP não foi recebida"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "O utilizador será ligado a %s sem OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "Invisível"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Estou %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5257,300 +5859,560 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Eu gostaria de o adicionar à minha lista"
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Bindings do python D-Bus estão em falta neste computador"
 
-#: ../src/common/connection_handlers.py:49
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Serviço/Recurso indisponível: Gajim não está a correr, ou remote_control é "
+"False"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus não está presente nesta máquina, ou falta módulo python"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Impossível entrar na sala"
+msgid "one"
+msgstr "Nenhum"
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Informação de registo para o transport %s não chegou a tempo"
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr ""
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Impossível entrar na sala"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Rua:"
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "É necessária uma palavra-passe para esta sala."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Porta:"
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Está banido/a desta sala."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "Ficheiro"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Tal sala não existe."
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "Criação de salas encontra-se restrita."
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Evento"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "A sua alcunha registada tem de ser usada."
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Não está na lista de membros."
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Continuar"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
 msgstr ""
-"A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
-"Por favor, introduza outra alcunha em baixo:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "estamos agora subscritos a %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Apagar MOTD"
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "pedido de remoção de subscrição por %s"
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "já não estamos subscritos a %s"
+msgid "%0 o'clock"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
 msgstr ""
-"JID %s não é compatível com RFC. Não será adicionado à sua lista. Utilize "
-"ferramentas de gestão de lista (roster) tais como http://jru.jabberstudio."
-"org/ para o remover."
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Registar para %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "A trabalhar"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Nenhum"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Evento"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Caractere inválido no nome de utilizador"
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Endereço de servidor necessário."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Caractere inválido no hostname."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Caractere inválido no recurso."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Indisponível"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Indisponível"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Livre para conversar"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Livre para conversar"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Disponível"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Ligando"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Ausente"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "In_visível"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "Desconhecido"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "Contém erros"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "Nenhuma"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "Nenhum"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Subscrição"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Dono"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrador"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Membro"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atenção à conversa"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "está a fazer outra coisa qualquer"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "está a escrever uma mensagem..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "pausa na composição da mensagem"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d mensagem não lida"
+msgstr[1] "Gajim - %d mensagens não lidas"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d mensagem não lida"
+msgstr[1] "Gajim - %d mensagens não lidas"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d mensagem de chat não lida"
+msgstr[1] "Gajim - %d mensagens de chat não lidas"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d mensagem privada não lida"
+msgstr[1] "Gajim - %d mensagens privadas não lidas"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr ""
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "cyan"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "a criar base de dados dos logs"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "para conta %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+msgid "Could not start local service"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Impossível ligar a \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Esta mensagem é encriptada]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Subscrever"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Endereço"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Ausente"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Download"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "<b>Notificações Visuais</b>"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Indisponível"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Apagar MOTD"
+
+#~ msgid "Contact _Info"
+#~ msgstr "_Infos do Contacto"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informações do Contacto"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#, fuzzy
+#~ msgid "Invalid room or server name"
+#~ msgstr "Nome de utilizador inválido"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Versão D-Bus desconhecida: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ 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."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Fazendo a 'migração' dos logs..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr ""
+#~ "Por favor, aguarde enquanto que a migração dos seus registos de conversas "
+#~ "é feita "
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Juntar-se a uma Nova Sala"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Esconder este menú"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d mensagem não lida"
+#~ msgstr[1] "Gajim - %d mensagens não lidas"
+
+#, fuzzy
+#~ msgid "Since %s"
+#~ msgstr "Tamanho: %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Autorizar automaticamente contacto"
 
@@ -5611,9 +6473,6 @@ msgstr "cyan"
 #~ msgid "Send"
 #~ msgstr "Enviar"
 
-#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-#~ msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
-
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s enviou-lhe uma nova mensagem."
 
@@ -5758,17 +6617,10 @@ msgstr "cyan"
 #~ msgid "Open Download Page"
 #~ msgstr "Abrir Página para Download"
 
-#~ msgid "Service not available"
-#~ msgstr "Serviço não disponível"
-
 #~ msgid "Session bus is not available."
 #~ msgstr "Bus da sessão não está disponível."
 
 #, fuzzy
-#~ msgid "with account %s"
-#~ msgstr "para conta %s"
-
-#, fuzzy
 #~ msgid "with account "
 #~ msgstr "conta: "
 
@@ -5912,9 +6764,6 @@ msgstr "cyan"
 #~ msgid "Click to get contact's extended information"
 #~ msgstr "Clique para receber informações detalhadas do contacto"
 
-#~ msgid "Enter your message:"
-#~ msgstr "Introduza a sua mensagem :"
-
 #~ msgid "_Compact View"
 #~ msgstr "Vista _Compacta"
 
@@ -5971,9 +6820,6 @@ msgstr "cyan"
 #~ msgid "Show roster window on Gajim startup"
 #~ msgstr "Mostrar janela principal ao arranque"
 
-#~ msgid "_Join Group Chat"
-#~ msgstr "_Entrar num Chat"
-
 #~ msgid "_Service Discovery"
 #~ msgstr "_Busca de Serviços"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 94e0b1e5e..467f9b22e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the Gajim package.
 # junix <junix@targetlinux.org>, 2005.
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.81\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-04-14 23:41-0300\n"
 "Last-Translator: Alfredo Saldanha Jr. <junix@targetlinux.org>\n"
 "Language-Team: none\n"
@@ -19,15 +19,15 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Gajim Instant Messenger"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
 
@@ -44,16 +44,23 @@ msgid "_Discover Services..."
 msgstr "_Descubra Serviços..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Conferência"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Editar Conta..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Abrir Cliente de E-mail"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
 
@@ -108,7 +115,7 @@ msgid "Pass_word:"
 msgstr "_Senha:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Salvar senha"
 
@@ -133,7 +140,7 @@ msgid "Your JID:"
 msgstr "Seu JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Avançado"
 
@@ -147,7 +154,7 @@ msgid "_Host:"
 msgstr "_Host:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Senha:"
 
@@ -179,10 +186,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diversos</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informações Pessoais</b>"
 
@@ -199,6 +208,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Reconectar automaticamente quando a conexão cair"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar na inicialização do Gajim"
 
@@ -219,6 +229,7 @@ msgstr ""
 "TLS será desabilitado"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "_Escolha a chave..."
 
@@ -235,16 +246,16 @@ msgid "Edit Personal Information..."
 msgstr "Editar detalhes pessoais..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Geral"
 
@@ -270,6 +281,7 @@ msgstr ""
 "Se marcado, o Gajim enviará pacotes keep-alive que evitam queda de conexão"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -278,6 +290,7 @@ msgstr ""
 "'leitura' somente para você"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -286,6 +299,7 @@ msgstr ""
 "usando esta conta"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -302,18 +316,23 @@ msgstr "Informações sobre você são gravadas no servidor"
 msgid "Manage..."
 msgstr "Gerenciar..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Nenhum"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informações Pessoais"
 
@@ -336,14 +355,18 @@ msgstr ""
 "conta; O cliente com a maior prioridade receberá os eventos"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "_Recurso: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -357,40 +380,46 @@ msgstr ""
 "com o recurso 'Casa' e 'Trabalho' ao mesmo tempo. O recurso que possuir a "
 "maior prioridade receberá os eventos. (veja abaixo)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Salvar _frase de acesso (inseguro)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Salvar histórico para todos os contatos desta conta"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes para manter a conexão (keep-alive)"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "_Sincronizar status da conta com status global"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (obsoleto, apenas para servidores antigos)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Usa nomedohost/porta customizada"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Usa proxies de transferência de arquivos"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Nome: "
 
@@ -400,62 +429,91 @@ msgstr "Contas"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Se você tem duas ou mais contas e isto é marcado, Gajim listará todos os "
 "contatos como se você tivesse somente uma conta"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Juntar contato das contas"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Remover"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Conta:"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Permita que ele/ela ver meu status"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Adicionar Novo Contato"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Por favor, eu gostaria de adiciona-lo à  minha lista."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Conta:"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Grupo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 msgid "_Nickname:"
 msgstr "_Apelido:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protocolo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Inscrever"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Re_gistrar"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "ID do Usuário:"
@@ -547,82 +605,63 @@ msgstr "<b>Sons</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Endereço"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "_Ações Avançadas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Editor de Configurações Avançadas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Status: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Afastado"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Ocupado"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Download"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "comando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Adicionando Notificação Especial para %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Não Disponível"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Livre para Conversa"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -635,75 +674,75 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Esconder os botões na janela de conferência"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "_Usar uma única janela de conversa com abas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Mostre somente na _lista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Mostre somente na _lista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Porta:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -738,7 +777,7 @@ msgstr "_Ingressar numa Conferência"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Adicionar à  Lista"
 
@@ -759,7 +798,8 @@ msgid "_Open Link in Browser"
 msgstr "_Abrir link no Navegador"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Iniciar conversa"
@@ -769,7 +809,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Clique para ver o histórico de conversas com este contato"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Enviar _Arquivo"
 
@@ -785,7 +826,8 @@ msgstr "Visão _Compacta    Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Histórico"
 
@@ -852,7 +894,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Mostrar um alerta visual quanto uma transferência de arquivo terminar"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -889,39 +931,34 @@ msgstr ""
 "Faixa"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Ativo"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Compôr"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Estilo da fonte:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Customização de Temas do Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Ido"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Inativo"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -929,7 +966,7 @@ msgstr ""
 "MUC\n"
 "Mensagens"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -937,19 +974,19 @@ msgstr ""
 "MUC Direto\n"
 "Mensagens"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Pausa"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "_Cor do texto"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "_Fonte do texto"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "Cor _de fundo"
 
@@ -1069,7 +1106,7 @@ msgid "Accept"
 msgstr "Aceitar"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Negar"
 
@@ -1077,13 +1114,14 @@ msgstr "Negar"
 msgid "Invitation Received"
 msgstr "Convite Recebido"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Apelido:"
 
@@ -1101,13 +1139,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Servidor:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Ingressar"
 
@@ -1133,6 +1166,10 @@ msgstr "Gerenciar Bookmarks"
 msgid "Print status:"
 msgstr "Imprimir tempo:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Servidor:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Título:"
@@ -1154,7 +1191,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Gerenciar Perfis de Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1170,20 +1208,21 @@ msgstr "Usar autenticação"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Clique para inserir um emoticon (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "Criptografia OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Ações"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -1257,18 +1296,25 @@ msgid "Also known as iChat style"
 msgstr "Conhecido também como estilo iChat"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Solicite uma mensagem de status quanto eu:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Marcar como _afastado depois:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Marcar como _afastado depois:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1280,19 +1326,19 @@ msgstr ""
 "Sempre usar aplicações padrão KDE\n"
 "Customizar"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "_Antes do apelido:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Noti_ficações do status da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1303,35 +1349,40 @@ msgstr ""
 "de qualquer contato que você não possuir na sua lista e queria lhe enviar "
 "uma mensagem"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Mensagem de status"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "_Conjunto de Ícones de status padrão:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostrar a_vatar dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar _mensagem de status da lista de contato"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "De 5 _em 5 minutos"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Eventos"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1341,13 +1392,13 @@ msgstr ""
 "você pode ter com um contato. Aqui você pode especificar quais caracteres "
 "você quer para enviar a outra parte."
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Gajim automaticamente mostrará novos eventos em uma janela pop-up relativa"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1355,7 +1406,7 @@ msgstr ""
 "Gajim notificará você de uma novo evento via uma alerta visual na lateral "
 "inferior direita da tela"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1363,7 +1414,7 @@ msgstr ""
 "Gajim notificará você através de um alerta visual na parte inferior direita "
 "da tela sobre os contatos que se conectaram"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1371,12 +1422,18 @@ msgstr ""
 "Gajim notificará você através de um alerta visual na parte inferior direita "
 "da tela sobre os contatos que se desconectaram"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim mudará somente o ícone do contato que provocou o evento novo"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1384,7 +1441,7 @@ msgstr ""
 "Se marcado, Gajim mostrará avatars dos contatos na janela da lista e na "
 "conferência"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1392,7 +1449,7 @@ msgstr ""
 "Se marcado, Gajim indicará mensagens de status dos contatos sob o nome do "
 "contato na janela da lista e na conferência"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1400,7 +1457,7 @@ msgstr ""
 "Se marcado, o Gajim lembrará a posição e tamanho da janela principal na "
 "próxima vez que você executa-lo"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1410,7 +1467,7 @@ msgstr ""
 "exemplo, um contato do MSN terá o ícone equivalente do MSN para o status "
 "conectado, ausente, ocupado, etc....)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1418,11 +1475,11 @@ msgstr ""
 "Se habilitado, Gajim substituirá o ascii para smilies, como ':)' com a "
 "animação equivalente ou estático emoticons gráfico"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "Gere_nciar..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1434,80 +1491,84 @@ msgstr ""
 "Por conta\n"
 "Por tipo"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Notifique-me sobre contatos ao: "
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Notificar nova mensagem do _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "Em todas as _mensagens"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "Uma _janela de mensagem"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Imprimir tempo:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "Salvar _posição e tamanho das janelas de conversa e lista de contatos"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Mostre somente na _lista"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_Conectar"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "A mensagem de status para o ausente automático"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "A mensagem de status para o afastado automático"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Usar conjunto de ícones de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Usar ícone na bandeja (também conhecido por área de notificação)"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1519,151 +1580,160 @@ msgstr ""
 "sobre ele. Por favor, note que os eventos sobre mensagens novas ocorrem "
 "somente se for uma mensagem nova de um contato que você não está conversando"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Quando novo evento é recebido"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Editor de Configurações Avançadas"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "_Depois da hora:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "A_ntes da hora:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Navegar:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "_Gerenciamento de arquivos:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Fonte:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore eventos de contatos que não estejam na minha lista"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "Mensagem _recebida:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Log mudanças de status dos contatos"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Cliente de email:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Notifique-me sobre isto"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "Mensagem _enviada:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Tocador de som:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Alerta visual"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "Voltar para as Cores _Padrões"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "_Ordena contatos pelo status"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "_Mensagem de status:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minutos"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "ConversasPrivada"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Formato da linha</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "C_onectar na inicialização do Gajim"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Deletar"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Lista de Banidos"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Inscrição"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "Neste grupo"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1671,32 +1741,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Enviar mensagem"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Peça para ver o status dele/dela"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Permita que ele/ela ver meu status"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Sobre"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Endereço"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Configurar _Avatar"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Aniversário:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Cidade:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Empresa:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "País:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Departamento:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Complemento:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Família:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: YYYY-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Nome:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Nome do meio:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Mais"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Informações Pessoais"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefone:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Cargo:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Código Postal:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Prefixo:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Função:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Estado:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Rua:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Sobrenome:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Trabalho"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Publicar"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Recuperar"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1716,47 +1926,58 @@ msgid "A_sk to see his/her status"
 msgstr "Peça para ver o status dele/dela"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Adicionar Notificações Visuais"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Atribuir chave OpenPGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Enviar _Mensagem Simples"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Iniciar conversa"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Permita que ele/ela ver meu status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Proibir ele/ela a ver meu status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Remover da Lista"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Inscrição"
 
@@ -1781,42 +2002,53 @@ msgid "Help online"
 msgstr "Ajuda online"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Perfil, Avatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transportes"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contatos desc_onectados"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Índices"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Descubra Serviços"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Sair"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Voz"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Ir"
@@ -1886,24 +2118,20 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorize o contato para que ele saiba quando você estiver conectado"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "_Informações de Contato"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Negando a autorização do contato, ele não poderá saber quando você está "
 "conectado"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Solicitação de Inscrição"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Negar"
 
@@ -1919,164 +2147,51 @@ msgstr "Mostre _Lista"
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Sobre"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Endereço"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Perguntar:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Aniversário:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Cidade:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Empresa:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Informações do Contato"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "País:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Departamento:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Complemento:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Família:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: YYYY-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Nome:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Homepage:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Contatos"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Endereço"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Nome do meio:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Mais"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "SO:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Telefone:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Cargo:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Código Postal:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Prefixo:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Função:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Configurar _Avatar"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Estado:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Rua:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Inscrição:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Sobrenome:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Trabalho"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Histórico de Conversação"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Publicar"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Recuperar"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafégo do Jabber</b>"
@@ -2108,30 +2223,165 @@ msgstr "_Mensagem"
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Nome:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Nome:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Detalhes Pessoais"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Editar Conta..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Usa nomedohost/porta customizada"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Nome da preferência"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Nada)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Escondido"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Geral"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "verde"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Endereço"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Itálico"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Publicar"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2147,52 +2397,62 @@ msgstr ""
 " globalmente em/etc/profile.\n"
 "Caracteristica de destacar palavras erradas não será usada"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Conversas"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s: %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s não tem a transmissão uma chave de OpenPGP, nem uma foi atribuída"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Criptografia habilitada"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Criptografia desabilitada"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Você acabou de receber uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2200,80 +2460,96 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "A cada %s _minutos"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Ativo"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Uma conexão não está disponível"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Primeira Mensagem Recebida"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Nova Mensagem Recebida"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Contato Conectado"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Contato Desconectou"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Mensagem Enviada"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem Destacada de Conferência"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Mensagem de Conferência Recebida"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar disconectado."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Eventos não lidos"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, você deve ler todas os eventos pendentes."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2281,145 +2557,175 @@ msgstr ""
 "Este nome já está sendo usado por outra de suas contas. Por favor, escolha "
 "outro nome."
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido:"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve ter o seguinte formato \"usuário@nomedoservidor\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Estou de volta."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Re-autenticar agora?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se você quer aplicar todas as mudanças, deve se re-autenticar."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Você deve primeiro criar sua conta antes de editar suas informações pessoais."
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Você deve estar conectado para editar suas informações pessoais."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr ""
+"Você deve primeiro criar sua conta antes de editar suas informações pessoais."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Seleção de Chave OpenPGP"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Ler todos os eventos pendentes antes de remover esta conta."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Você não tem uma conta ativa"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Nome de conta já está em uso"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Lista de Banidos"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Lista de Membros"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Lista de Donos"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Lista de Administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Razão"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Lista"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Banindo..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2427,11 +2733,11 @@ msgstr ""
 "<b>Quem você quer banir?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Adicionando Membro..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2439,11 +2745,11 @@ msgstr ""
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Adicionando Proprietário..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2451,11 +2757,11 @@ msgstr ""
 "<b>Quem você quer tornar um dono?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Adicionando Administrador..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2463,7 +2769,7 @@ msgstr ""
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2479,89 +2785,90 @@ msgstr ""
 "4. domínio (o domínio combina por si com qualquer usuario@domínio,\n"
 "domínio/recurso, ou endereço contendo um subdomínio."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nova Sala"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Conferência"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Bookmark tem dados inválidos"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, tenha certeza que preencheu os campos servidor e sala ou remova "
 "este bookmark"
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Você deve entrar com uma senha para registrar uma nova conta."
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID Duplicado"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Esta conta já está configurada no Gajim."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2570,23 +2877,23 @@ msgstr ""
 "Avançado, ou mais tarde clicando em Contas no item de menu da janela "
 "principal."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2594,465 +2901,516 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde a última vez onde você "
 "prestou a atenção a conferência"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Ações para \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL do Dicionário não existe \"%s\" e isto não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Procura na Web por isto"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "%i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "Acesso ao python D-Bus foi perdido neste computador"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contato <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Nome do Contato"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Mensagem de status"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Salvar como a mensagem de status pré-configurada"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Por favor, escreva um nome para esta mensagem de status"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Endereço:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Endereço:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Complemento:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, preencha os dados do contato se você quer adicionar na conta %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contato que você quer adicionar"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à  lista"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "ID do Usuário:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Desenvolvedores Passados:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Desenvolvedores Passados:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "AGRADECIMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Nós gostaríamos de agradecer todos os mantedores do pacote."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br> e Juracy Filho <juracy@gmail.com>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossível ingressar na sala"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Solicitação de inscrição para conta %s de %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Você já está na sala %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Você não pode ingressar em uma sala de conferência até que esteja conectado."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Sala inválida ou nome do servidor"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Jabber ID Inválido:"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "O nome da sala ou nome do servidor não é permitido alguns caracteres."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Entre com o ID do do contato que você gostaria de\n"
 "enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, tenha certeza que você está conectado com \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido:"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível gravar o arquivo em %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar contectado para mudar sua senha"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Nova Mensagem"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Enviar Mensagem Privada"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Novo E-Mail"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Solicitação de Transferência de Arquivos"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Arquivos"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Transferência do Arquivo Completa"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Transferência do Arquivo Parada"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Convite para Conferência"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contato desconectou"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
+msgstr "Mensagem simples com conta %s"
+
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
 msgstr "Mensagem simples com conta %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Descrição: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato da linha</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato da linha</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "ConversasPrivada"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s lhe convidou para sala %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s chega:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adicionando Notificação Especial para %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Conexão"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Você deve estar conectado para visualizar os serviços disponíveis"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviços usando conta %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Buscar Serviços"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3060,46 +3418,51 @@ msgstr ""
 "Não existe serviço para o endereço que você entrou, ou não está respondendo. "
 "Verifique o endereço e tente novamente."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de serviço não contém nenhum item para navegar."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Visualizando %s usando conta %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Este serviço não contém nenhum item para navegar."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Buscando %d / %d"
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Usuários"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Descrição"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Arquivo"
@@ -3117,7 +3480,7 @@ msgstr "Progresso"
 msgid "Filename: %s"
 msgstr "Nome do arquivo: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
@@ -3125,17 +3488,17 @@ msgstr "Tamanho: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Destinatário: "
 
@@ -3156,78 +3519,88 @@ msgstr "Transferência de arquivos cancelada"
 msgid "Connection with peer cannot be established."
 msgstr "Conexão ponto a ponto não pode ser estabelecida."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Destinatário: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Entre com sua mensagem:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Transferência de arquivo parada pelo contato do outro lado"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Escolha o Arquivo para Enviar..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim não pode acessar este arquivo"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Este arquivo está sendo usado por outro processo."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Arquivo: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "O que você quer fazer?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Salvar Arquivo como..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3235,58 +3608,260 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Arquivo inválido"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Arquivo:"
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "não é possível enviar arquivos vazios"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim necessita do Xserver para rodar. Encerrando..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim necessita PyGTK 2.6 ou acima"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim necessita PyGTK 2.6 ou acima para rodar. Encerrando..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim necessita GTK 2.6 ou acima"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim necessita GTK 2.6 ou acima para rodar. Encerrando..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "Não existe suporte para libglade no GTK+ runtime"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Por favor remova seu GTK+ runtime atual e instale a última versão estável de "
+"%s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Por favor certifique-se de que o GTK e o PyGTK tem suporte ao libglade em "
+"seu sistema."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim necessita de PySQLite2 para rodar"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim necessita de PySQLite2 para rodar"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "Autorização HTTP (%s) para %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Você aceita a solicitação?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Conexão"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Assunto: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "erro no envio %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Autorização aceita"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "O contato \"%s\" autorizou você para ver seu status."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Contato \"%s\" removeu sua inscrição"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Você sempre o verá como offline."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Contato com \"%s\" não pode ser estabelecido"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Verifique sua conexão ou tente novamente mais tarde."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s agora está %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Sua frase de acesso está incorreta"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Você está atualmente conectado sem sua chave OpenPGP."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Novo E-mail em %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Você tem %d nova mensagem de E-mail"
+msgstr[1] "Você tem %d novas mensagens de E-mail"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s quer te enviar um arquivo:"
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Você recebeu com sucesso %(filename)s de %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Você enviou com sucesso o %(filename)s a %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Transferência de arquivo de %(filename)s to %(name)s parado."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Por favor preencha os dados para sua nova conta</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Impossível salvar suas preferências"
+
+#: ../src/gajim.py:1998
+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-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "mostrar ajuda para um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "mostrar ajuda no comando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Mostrar ou esconder a janela principal"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Mostrar uma janela com a próxima mensagem não lida"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3294,47 +3869,47 @@ msgstr ""
 "Imprimir uma lista de todos os contatos na lista. Cada contato aparecerá em "
 "uma linha separada"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "mostrar somente os contatos desta conta"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Imprimir uma lista das contas registradas"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Mudar o status da conta ou contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "mensagem"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "mensagem de status"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3343,21 +3918,21 @@ msgstr ""
 "status de todas as contas existentes com a opção \"sincronizar com status "
 "global\" marcada"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Mostrar o diálogo do bate-papo onde você pode enviar mensagens para um "
 "contato"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contato que você quer conversar"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se especificado, o contato é feito da lista de contatos desta conta"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3368,28 +3943,28 @@ msgstr ""
 "conta são opcionais. Se vc quer configurar somente a 'conta', sem a 'chave "
 "pgp', apenas configure a 'chave pgp' para ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contato que irá receber a mensagem"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "conteúdos da mensagem"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se especificada, a mensagem será criptografada usando esta chave pública"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificada, a mensagem será enviada usando esta conta"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3400,127 +3975,142 @@ msgstr ""
 "conta são opcionais. Se vc quer configurar somente a 'conta', sem a 'chave "
 "pgp', apenas configure a 'chave pgp' para ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Assunto"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Mensagem Enviada"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID do contato"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Enviar arquivo para um contato"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "arquivo"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Caminho do arquivo"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "se especificada, arquivo irá ser enviado usando esta conta"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Lista todas as preferências e seus valores"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ajusta o valor da 'chave' ao 'valor '."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'chave' é o nome de preferência, 'valor' é o valor para ajustá-la"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Deleta um item de preferência"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a ser deletado"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Escreve o estado atual das preferências do Gajim em um arquivo .config"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Remover contato da lista"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Adicionar contato para a lista"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Adicionar novo contato para esta conta"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Retorna o status atual (global a menos que o cliente for especificado)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Retorna a mensagem de status atual (global a menos que a conta for "
 "especificada)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Retorna o número das mensagens não lidas"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "Console XML"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento não informado \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3529,16 +4119,11 @@ msgstr ""
 "'%s' não está em sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Você não tem uma conta ativa"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Versão dbus desconhecida: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3547,16 +4132,16 @@ msgstr ""
 "Uso: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3565,7 +4150,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um desses:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3574,331 +4159,135 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Tipo \"%s ajuda %s\" para maiores informações"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim necessita do Xserver para rodar. Encerrando..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim necessita PyGTK 2.6 ou acima"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim necessita PyGTK 2.6 ou acima para rodar. Encerrando..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim necessita GTK 2.6 ou acima"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim necessita GTK 2.6 ou acima para rodar. Encerrando..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Não existe suporte para libglade no GTK+ runtime"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Por favor remova seu GTK+ runtime atual e instale a última versão estável de "
-"%s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Por favor certifique-se de que o GTK e o PyGTK tem suporte ao libglade em "
-"seu sistema."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim necessita de PySQLite2 para rodar"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Autorização HTTP (%s) para %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Você aceita a solicitação?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "erro no envio %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Autorização aceita"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "O contato \"%s\" autorizou você para ver seu status."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Contato \"%s\" removeu sua inscrição"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Você sempre o verá como offline."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Contato com \"%s\" não pode ser estabelecido"
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Verifique sua conexão ou tente novamente mais tarde."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s agora está %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Sua frase de acesso está incorreta"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Você está atualmente conectado sem sua chave OpenPGP."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Novo E-mail em %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Você tem %d nova mensagem de E-mail"
-msgstr[1] "Você tem %d novas mensagens de E-mail"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s quer te enviar um arquivo:"
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Você recebeu com sucesso %(filename)s de %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Você enviou com sucesso o %(filename)s a %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Transferência de arquivo de %(filename)s to %(name)s parado."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "Publicação do vCard bem sucedida"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Suas informações pessoais foram publicadas com sucesso."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "Publicação do vCard falhou"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Houve um erro ao publicar sua informação pessoal, tente outra vez mais tarde."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Impossível salvar suas preferências"
-
-#: ../src/gajim.py:1903
-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:1932
-msgid "Migrating Logs..."
-msgstr "Migrando Logs..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Espere por favor, enquanto os registros estão sendo migrados..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Você não pode apagar o seu tema corrente"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Conversa Privada"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "ConversasPrivada"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Falha ao Enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Você não esta mais na sala \"%s\" ou \"%s\" saiu."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Conferência"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Conferências"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Mudar _Apelido"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Esta sala não tem assunto"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi chutado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s  foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s  foi banido por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s agora está %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Apelido não encontrado: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Esta sala não tem assunto"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Convidado %(contact_jid)s para %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s não parece ser um JID válido"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Comando não encontrado: /%s (se você quer enviar isto, use este prefixo /say)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3911,7 +4300,7 @@ msgstr ""
 "atualmente na sala, ele/ela será chutado também.  Não suporta espaços no "
 "apelido."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3919,12 +4308,12 @@ msgstr ""
 "Uso: /%s <apelido>, abre uma janela de conferência privada para um ocupante "
 "específico."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, apaga o texto da janela."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3933,12 +4322,12 @@ msgstr ""
 "Uso: /%s [rasão], fecha a janela corrente ou a aba, mostrando a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, esconde os botões do bate-papo."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3947,7 +4336,7 @@ msgstr ""
 "Uso: /%s <JID> [ razão ], convida JID à  sala atual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -3956,7 +4345,7 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/apelido], oferece para entrar na sala@servidor "
 "opcionalmente usando um apelido específico."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3966,7 +4355,7 @@ msgstr ""
 "Uso: /%s <apelido> [razão], remove o ocupante especificado pelo apelido da "
 "sala e indica opcionalmente uma razão.  Não suporta espaços no apelido."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -3975,7 +4364,7 @@ msgstr ""
 "Uso: /%s <ação>, emite a ação à  sala atual. Use a terceira pessoa (por "
 "exemplo: /%s explodes.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -3984,182 +4373,182 @@ msgstr ""
 "Uso: /%s <apelido> [mensagem], abre uma janela de mensagem privada e envia "
 "uma mensagem ao ocupante especificado pelo apelido."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Uso: /%s <apelido>, muda seu apelido na sala corrente."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "Uso: /%s [tópico], mostra ou atualiza o tópico da sala atual."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Uso: /%s [tópico], mostra ou atualiza o tópico da sala atual."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uso: /%s <mensagem>, envia uma mensagem sem procurar por outros comandos."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Sem ajuda para /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Você tem certeza que quer deixar a sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Se você fechar esta janela, você será desconectado desta sala."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "_Não me pergunte novamente"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Mudando Assunto"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Mudando Apelido"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique o novo apelido que você quer usar:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Bookmark já configurado"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos bookmarks."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Você pode gerenciar seus bookmarks pelo menu de Ações na janela principal."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Um erro de programação foi detectado"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr "Não é provavelmente fatal, mas deve ser reportado aos programadores."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Reportar Erro"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Detalhes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Erro ao analisar gramaticalmente o arquivo:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Não foi possível escrever à  %s. O suporte de gerência da sessão não funciona"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salvar Arquivo como..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Não foi encontrado banco de dados do histórico de logs"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Contatos"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Apelido"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Mensagem"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4167,7 +4556,7 @@ msgstr ""
 "Você quer limpar o banco de dados? (ALTAMENTE NÃO RECOMENDADO COM O GAJIM EM "
 "EXECUÇÃO)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4181,131 +4570,172 @@ msgstr ""
 "\n"
 "Se caso você clicou SIM, por favor espere... "
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Exportando Histórico de Logs..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s em %(time)s disse: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "quem"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Você realmente quer deletar os logs do contato selecionado?"
 msgstr[1] "Você realmente quer deletar os logs dos contatos selecionados?"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Esta é uma operação irreversível."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Você realmente quer deletar a mensagem selecionada?"
 msgstr[1] "Você realmente quer deletar as mensagens selecionadas?"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversação com %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s é agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s agora está %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status agora é: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Mensagens"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s agora está %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Conectou"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Desconectou"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Mensagem Simples de %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Nova Mensagem Privada da sala %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem de %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "A imagem não pode ser carregada"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Convite Recebido"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "Você deve estar conectado para publicar suas informações de contato."
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "Publicação do vCard falhou"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Houve um erro ao publicar sua informação pessoal, tente outra vez mais tarde."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Você deve estar conectado para receber suas informações de contato."
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observadores"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Você já está na sala %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Você não pode ingressar em uma sala enquanto está invisível"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
@@ -4313,108 +4743,138 @@ msgstr "usando %s conta"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Gerenciar Bookmarks..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Gerenciador de Histórico"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Ingressar na Nova Sala"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "_Ingressar na Conferência"
+
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Você tem mensagens não lidas"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Ler todos os eventos pendentes antes de remover esta conta."
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr ""
 "Você não poderá enviar e receber mensagens para contatos deste transporte"
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Transporte \"%s\" será removido"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Você não poderá enviar e receber mensagens para contatos deste transporte"
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Nova Sala"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de adiciona-lo à  minha lista"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Status"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4422,7 +4882,7 @@ msgstr ""
 "Removendo este contato, você também removerá a autorização, resultando em "
 "ele ou ela sempre o verá offiline."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4430,36 +4890,51 @@ 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:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Contato \"%s\" será removido de sua lista"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Removendo este contato, você também removerá a autorização, resultando em "
+"ele ou ela sempre o verá offiline."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Entre com a frase de acesso da chave GPG para conta %s"
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Salvar Frase de acesso"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso Errada"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, reescreva sua frase de segurança GPG ou pressione Cancelar."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4467,20 +4942,21 @@ 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:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 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:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Você tem mensagens não lidas"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4488,145 +4964,111 @@ msgstr ""
 "Mensagem somente estará disponível para leitura mais tarde se você tiver o "
 "histórico habilitado."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Derrubar %s no grupo %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Fazer %s e %s metacontatos"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Status..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Status..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Esconder este menu"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - uma mensagem não lida"
-msgstr[1] "Gajim - %d mensagens não lidas"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - uma mensagem não lida"
-msgstr[1] "Gajim - %d mensagens não lidas"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d mensagem simples não lida"
-msgstr[1] "Gajim - %d mensagens simples não lidas"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d mensagem de conferência não lida"
-msgstr[1] "Gajim - %d mensagens de conferência não lidas"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d mensagem privada não lida"
-msgstr[1] "Gajim - %d mensagens privadas não lidas"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Regra: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Filiação: "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Status: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Inscrição: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Último status conectado %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Desde %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "desde %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Não iniciado"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Parado"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Completo"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Parado"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço não respondeu ainda com informação detalhada"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4634,25 +5076,25 @@ msgstr ""
 "Este serviço não poderia responder com informações detalhadas.\n"
 "É mais provável quebrado"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "A imagem não pode ser carregada"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Filiação: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4660,7 +5102,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:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4668,13 +5110,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:336
+#: ../src/vcard.py:269
 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:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4682,28 +5124,16 @@ msgstr ""
 "Você não está interessado na presença do contato, e nenhum está interessado "
 "no seu"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 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:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/vcard.py:458
-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:491
-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:495
-msgid "Personal details"
-msgstr "Detalhes Pessoais"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "criando banco de dados de logs"
 
@@ -4728,93 +5158,88 @@ msgstr "%s é um diretório, mas deveria ser um arquivo"
 msgid "creating %s directory"
 msgstr "criando diretório %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (aka python-pysqlite2) está faltando. Encerrando..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Serviço nao disponível: Gajim não está funcionando, ou o remote_control é "
-"falso"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus não está presente nesta máquina o módulo python está faltando"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Sessão não está disponível.\n"
-"Tente lendo http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Use DBus e Notification-Daemon para mostrar notificações"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Minutos, depois do qual seu status mudam a afastado."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Afastado em conseqüência de estar inativo"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Minutos, depois do qual seu status mudam a nao disponível."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Não disponível em conseqüência de estar inativo"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Aproveite * /_ pares como caráteres possíveis do formato. "
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se verdadeiro, não remova */_. Assim * ABC * seja negrito(realce) mas com * "
 "* não removido."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no arquivo de lista?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4822,12 +5247,12 @@ msgstr ""
 "Quantas linhas para lembrar da conversação precedente quando uma aba/janela "
 "de bate-papo for reaberto."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Quantos minutos devem durar linhas do último precedente da conversação."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4835,11 +5260,11 @@ msgstr ""
 "Enviar a mensagem com Ctrl+Enter e com entram fazem a linha nova "
 "(comportamento padrão do cliente ICQ da Mirabilis)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quantas linhas à armazenar para Ctrl+KeyUP."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4848,22 +5273,22 @@ msgstr ""
 "Um ou outro URL costuma vir com o %s nele onde %s é a palvra/frase ou ' em "
 "WIKTIONARY ' que significam o uso wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se verificado, Gajim pode ser remotamente controlado usando gajim-remoto."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar um aba ou janela de conferência."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4871,7 +5296,7 @@ msgstr ""
 "Sempre perguntar antes de fechar um aba/janela neste espaço listas de salas "
 "separadas por jids."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4879,7 +5304,7 @@ msgstr ""
 "Nunca perguntar antes de fechar uma aba/janela de conferência neste espaço "
 "listas de salas separadas por jids."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4887,24 +5312,24 @@ msgstr ""
 "Cancela o host que nos enviou um transferência de arquivo caso que foi "
 "direcionado do endereço tradução/porta."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Padrão da IEC diz que KiB = 1024 bytes e KB = 1000 bytes."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando tiver apenas uma bate papo?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda da aba com apenas um bate papo?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4912,7 +5337,7 @@ msgstr ""
 "Uma lista semicolon-separada das palavras que serão destacadas no bate-papo "
 "multi-user."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4920,11 +5345,11 @@ msgstr ""
 "Se verdadeiro, o Gajim sairá quando o botão sair da janela for clicado. Esta "
 "opção só faz sentido quando a opção trayicon está sendo usada."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Se verdadeiro, Gajim registra-se para xmpp:// a cada inicialização."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4932,15 +5357,16 @@ msgstr ""
 "Se verdadeiro, Gajim mostrará um ícone para cada aba contendo mensagens não "
 "lidas. Dependendo do tema, este ícone pode ser animado."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Se verdadeiro, Gajim indicará a mensagem de status, se não, esvazía-a, para "
 "cada contato sob o nome do contato na janela da lista"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4948,7 +5374,7 @@ msgstr ""
 "Se verdadeiro, Gajim pedirá por avatar cada contato que não teve um avatar "
 "ou tem um cache que é velho demais."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4957,20 +5383,29 @@ msgstr ""
 "Se falso, você verá não mais por muito tempo a linha de status nos bate-"
 "papos quando um contato muda seu ou seu status e/ou sua mensagem do status."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4980,17 +5415,19 @@ msgstr ""
 "faz a janela piscar (o comportamento padrão na maioria dos Gerenciadores de "
 "Janela) quando esperam eventos pendentes."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 não trata informações do sha quando entra numa sala protegida por "
 "senha. Mude esta opção para Falso para parar de emitir as informações sha em "
 "presenças de conferências"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4998,7 +5435,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Controlar a janela onde novas mensagens são colocadas.\n"
 "'sempre' - Todas as mensagens são enviadas para uma única janela.\n"
@@ -5008,53 +5445,68 @@ msgstr ""
 "conferência) são enviadas para uma janela específica. Nota, esta mudança "
 "requer o reinício do Gajim antes que tenham efeito."
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Se Falso, você não verá por muito tempo o avatar na janela do bate-papo"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se Verdadeiro, pressionando a tecla escape fecha a aba/janela"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Esconder os botões na janela de conferência"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Esconder os botões na janela de conversa para duas pessoas "
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Esconder o banner na janela de conferência"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Esconder o banner na janela de conversa para duas pessoas "
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "Esconder a lista dos ocupantes da sala na janela da conferência"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 rodando"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5062,59 +5514,106 @@ msgstr ""
 "Se checado, o Gaijm usará seu IP e proxies definidos no "
 "file_transfer_proxies, em opções para transferência de arquivos."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP não disponível neste computador"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Disponível"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Livre para Conversa"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Serviço não disponível"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5122,7 +5621,7 @@ msgstr ""
 "Som para tocar quando uma mensagem MUC conter uma das palavras no "
 "muc_hightlight_words, ou quando uma mensagem MUC conter seu apelido."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5130,97 +5629,209 @@ msgstr ""
 "Som para tocar quando qualquer mensagem MUC chegar. (este ajuste é feito "
 "exame no cliente somente se os notify_on_all_muc_messages for verdadeiro)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "mantimento"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "marinho"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Impossível ingressar na sala"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Frase de acesso Errada"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "A informação do registo para o transporte %s não chegou a tempo"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Apelido não encontrado: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Impossível ingressar na sala"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Uma senha é requerida para entrar nesta sala."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Você está banido desta sala."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Tal sala não existe."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "A criação de sala é restrita."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Seu nickname registado deve ser usado."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Você não está na lista de membros."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Seu nickname desejado está em uso ou registado por um outro usuário.\n"
+" Por favor, especifique um outro nickname abaixo:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Eu gostaria de adiciona-lo à  minha lista."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "nós estamos agora inscritos para %s"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Remoção de Inscrição solicitada por %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "nós estamos agora sem inscrição para %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"O Jid %s não é uma compilação da RFC. Não se adicionará a sua lista.  Use "
+"ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
+"removê-lo"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar enviando e recebendo mensagens, você precisará reconectar."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Transporte %s respondido errado para registar o pedido."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Resposta inválida"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado ao servidor %s:%s com %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique seu login e senha para exatidão."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "Palavra-chave do OpenPGP não foi recebida"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Você será conectado ao %s sem OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "invisível"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "desconectado"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Eu estou %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Esta mensagem está criptografada]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5229,300 +5840,560 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Eu gostaria de adiciona-lo à  minha lista."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Acesso ao python D-Bus foi perdido neste computador"
+
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 
-#: ../src/common/connection_handlers.py:49
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2 (aka python-pysqlite2) está faltando. Encerrando..."
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Serviço nao disponível: Gajim não está funcionando, ou o remote_control é "
+"falso"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus não está presente nesta máquina o módulo python está faltando"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Sessão não está disponível.\n"
+"Tente lendo http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Impossível ingressar na sala"
+msgid "one"
+msgstr "Nenhum"
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "A informação do registo para o transporte %s não chegou a tempo"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "quem"
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Impossível ingressar na sala"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Rua:"
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Uma senha é requerida para entrar nesta sala."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Porta:"
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Você está banido desta sala."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "arquivo"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Tal sala não existe."
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "A criação de sala é restrita."
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Evento"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Seu nickname registado deve ser usado."
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Você não está na lista de membros."
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Continuar"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
 msgstr ""
-"Seu nickname desejado está em uso ou registado por um outro usuário.\n"
-" Por favor, especifique um outro nickname abaixo:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "nós estamos agora inscritos para %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Deletar"
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Remoção de Inscrição solicitada por %s"
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "nós estamos agora sem inscrição para %s"
+msgid "%0 o'clock"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
 msgstr ""
-"O Jid %s não é uma compilação da RFC. Não se adicionará a sua lista.  Use "
-"ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
-"removê-lo"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Registro para %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Trabalhando"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Nenhum"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Evento"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Caracter inválido no nome do usuário"
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Endereço do servidor é requerido."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Caracter inválido no nome do host"
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Caracter inválido no recurso."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Não Disponível"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Não Disponível"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "Livre para _Conversa"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Livre para Conversa"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "Dis_ponível"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "_Afastado"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Afastado"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "_Invisível"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "?contato tem status:Com erros"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "?Inscrição existente:Nenhuma"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "?Pergunta (para Inscrição):Nenhuma"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "?Regra do Contato para Conversa em Grupo:Nenhuma"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Regra do Contato para Conversa em Grupo:Nenhuma"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "D_ono"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrador"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Membro"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "está escrevendo uma mensagem..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "pausa na digitação da mensagem"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - uma mensagem não lida"
+msgstr[1] "Gajim - %d mensagens não lidas"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d mensagem simples não lida"
+msgstr[1] "Gajim - %d mensagens simples não lidas"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d mensagem de conferência não lida"
+msgstr[1] "Gajim - %d mensagens de conferência não lidas"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d mensagem privada não lida"
+msgstr[1] "Gajim - %d mensagens privadas não lidas"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "ciano"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "criando banco de dados de logs"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "para conta %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "A imagem não pode ser carregada"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Impossível conectar a \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Esta mensagem está criptografada]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Inscrever"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Endereço"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Afastado"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Download"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Adicionando Notificação Especial para %s"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Não Disponível"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Deletar"
+
+#~ msgid "Contact _Info"
+#~ msgstr "_Informações de Contato"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informações do Contato"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Sala inválida ou nome do servidor"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Versão dbus desconhecida: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "Publicação do vCard bem sucedida"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Suas informações pessoais foram publicadas com sucesso."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Migrando Logs..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Espere por favor, enquanto os registros estão sendo migrados..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Ingressar na Nova Sala"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Esconder este menu"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - uma mensagem não lida"
+#~ msgstr[1] "Gajim - %d mensagens não lidas"
+
+#~ msgid "Since %s"
+#~ msgstr "Desde %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Autorizar automaticamente os contatos"
 
@@ -5731,17 +6602,10 @@ msgstr "ciano"
 #~ msgid "Open Download Page"
 #~ msgstr "Abrir Página para Download"
 
-#~ msgid "Service not available"
-#~ msgstr "Serviço não disponível"
-
 #~ msgid "Session bus is not available."
 #~ msgstr "Sessão bus não está disponível."
 
 #, fuzzy
-#~ msgid "with account %s"
-#~ msgstr "para conta %s"
-
-#, fuzzy
 #~ msgid "with account "
 #~ msgstr "conta: "
 
@@ -5888,9 +6752,6 @@ msgstr "ciano"
 #~ msgid "Click to get contact's extended information"
 #~ msgstr "Clique para informações completas do contato"
 
-#~ msgid "Enter your message:"
-#~ msgstr "Entre com sua mensagem:"
-
 #~ msgid "_Compact View"
 #~ msgstr "Visão _Compacta"
 
@@ -5945,9 +6806,6 @@ msgstr "ciano"
 #~ msgid "Show roster window on Gajim startup"
 #~ msgstr "Mostrar a janela da lista de contatos na inicialização da aplicação"
 
-#~ msgid "_Join Group Chat"
-#~ msgstr "_Ingressar na Conferência"
-
 #~ msgid "_Service Discovery"
 #~ msgstr "_Busca de Serviços"
 
diff --git a/po/ru.po b/po/ru.po
index 6193824a9..fd80b5933 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,12 +10,12 @@
 #  <nebulam51@gmail.com>, 2005.
 # Yakov Bezrukov <nebulam51@gmail.com>, 2005, 2006.
 # Yakov Bezrukov <bezrukov@isp.nsc.ru>, 2005.
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-06-09 15:18+0300\n"
 "Last-Translator: Alex V. Myltsev <avm@altlinux.org>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -26,15 +26,15 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "Jabber-клиент на GTK+"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Клиент для мгновенных сообщений Gajim"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber-клиент на GTK+"
 
@@ -51,16 +51,23 @@ msgid "_Discover Services..."
 msgstr "_Просмотреть сервисы..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Комната"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Редактировать учетную запись..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Отправить письмо"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Статус"
 
@@ -115,7 +122,7 @@ msgid "Pass_word:"
 msgstr "П_ароль"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Сохранить _пароль"
 
@@ -140,7 +147,7 @@ msgid "Your JID:"
 msgstr "Ваш JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Дополнительные действия"
 
@@ -154,7 +161,7 @@ msgid "_Host:"
 msgstr "_Хост: "
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Пароль:"
 
@@ -186,10 +193,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Прочее</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Личная информация</b>"
 
@@ -206,6 +215,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Автоподключение при разрыве связи"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "_Соединяться при запуске Gajim"
 
@@ -226,6 +236,7 @@ msgstr ""
 "возможность, с этой же опцией TLS отключется"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Использовать _Ключ..."
 
@@ -242,16 +253,16 @@ msgid "Edit Personal Information..."
 msgstr "Редактировать личную информацию..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Общие"
 
@@ -277,6 +288,7 @@ msgstr ""
 "соединения по таймауту"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -285,6 +297,7 @@ msgstr ""
 "чтение только для вас"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -293,6 +306,7 @@ msgstr ""
 "jabber серверу с использованием этой учетной записи"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -310,18 +324,23 @@ msgstr "Информация о вас, как она хранится на се
 msgid "Manage..."
 msgstr "Управление..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Нет"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Редактировать Личную Информацию"
 
@@ -345,14 +364,18 @@ msgstr ""
 "события"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Прокси:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Ресу_рс: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -367,40 +390,46 @@ msgstr ""
 "одновременно. Ресурс, который имеет больший приоритет будет получать все "
 "события. (См. ниже)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Сохранить _парольную фразу (небезопасно)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "_История всех контактов для этой учетной записи"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Отправить пинг"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Син_хронизировать статус учетной записи с глобальным статусом"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Использовать _SSL (legacy)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Использовать пользовательские хост/порт"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Использовать прокси для передачи файла"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Имя: "
 
@@ -410,63 +439,92 @@ msgstr "Учетные записи"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Если у вас 2 и более учетных записей, то отметив здесь, вы заставите Gajim "
 "выводить вместе контакты из всех учетных записей"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Объединить учетные записи"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Изменить"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Удалить"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Учетные записи"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Позволить ему или ей видеть мой статус"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Добавить новый контакт"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Учетные записи"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Группа:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Ник:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Протокол:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Подписаться"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Пере_регистрировать"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "ID пользователя:"
@@ -559,82 +617,63 @@ msgstr "<b>Звуки</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Адрес"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "Расширенный"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Расширенный редактор настроек"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Статус: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Ушел"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Занят"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Загрузить"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Невидимка"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "команда"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Добавление специального уведомления для %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Недоступен"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Готов Поболтать"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Проигрывать _звук"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -647,74 +686,74 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Скрывает кнопки окна комнаты"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Open chat window with user"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Показывать только в _ростере"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Показывать только в _ростере"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Порт: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -749,7 +788,7 @@ msgstr "Войти в _Комнату"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "Добавить в ростер"
 
@@ -770,7 +809,8 @@ msgid "_Open Link in Browser"
 msgstr "_Просмотреть ссылку в браузере"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "Начать Чат"
@@ -780,7 +820,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Щелкните для просмотра бесед с этим человеком"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Отправить _Файл"
 
@@ -796,7 +837,8 @@ msgstr "_Компактный вид    Alt-C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_История"
 
@@ -860,7 +902,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показать уведомление по окончании загрузки"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Продолжить"
 
@@ -897,39 +939,34 @@ msgstr ""
 "Баннер"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Активен"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Жирный"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Печатает"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Шрифт:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Настройка тем для Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Ушел"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Неактивен"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Курсив"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -937,7 +974,7 @@ msgstr ""
 "MUC\n"
 "Сообщения"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -945,19 +982,19 @@ msgstr ""
 "Регулируемый MUC\n"
 "Сообщения"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Приостановлено"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "Цвет _текста:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "Цвет _шрифта:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "Цвет _фона"
 
@@ -1078,7 +1115,7 @@ msgid "Accept"
 msgstr "Принять"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Отклонить"
 
@@ -1086,13 +1123,14 @@ msgstr "Отклонить"
 msgid "Invitation Received"
 msgstr "Получено Приглашение"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Войти в комнату"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Ник:"
 
@@ -1110,13 +1148,8 @@ msgstr "Недавно:"
 msgid "Room:"
 msgstr "Комната:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Сервер:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Присоединиться"
 
@@ -1141,6 +1174,10 @@ msgstr "Управление Закладками"
 msgid "Print status:"
 msgstr "Выводить время:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Сервер:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Заголовок:"
@@ -1162,7 +1199,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Управление Профилями Прокси"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Имя:"
 
@@ -1178,20 +1216,21 @@ msgstr "Использовать аутентификацию"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Щелкните, чтобы вставить смайлик (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "Шифрование OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Действия"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Отправить"
 
@@ -1264,18 +1303,25 @@ msgid "Also known as iChat style"
 msgstr "как iChat стиль"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Запрашивать сообщение о статусе в момент: "
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Авто-_отошел после:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Авто-_недоступен после:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1287,19 +1333,19 @@ msgstr ""
 "Всегда использовать приложения KDE по умолчанию\n"
 "Другое"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "_До ника:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Чат"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "_Уведомление об изменении состояния:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1309,35 +1355,40 @@ msgstr ""
 "вас. Используйте с осторожностью, потому что это заблокирует все сообщения "
 "от контактов не из вашего ротера."
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Сообщение о статусе"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "_Иконки по умолчанию для статуса:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показавать а_ватары для контактов в ростере"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Показать _сообщения о статусе контакта в ростере"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "Каждые 5 _минут"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Смайлики:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "События"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1347,14 +1398,14 @@ msgstr ""
 "Здесь вы можете указать какие состояние беседы клиент будет отсылать вашему "
 "респонденту."
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Gajim будет автоматически показывать новые события поднимая соответствующее "
 "окно."
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1362,7 +1413,7 @@ msgstr ""
 "Gajim будет уведомлять вас о новых событиях с помощью сообщения в правом "
 "нижнем углу экрана"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1370,7 +1421,7 @@ msgstr ""
 "Gajim будет уведомлять вас о присоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1378,13 +1429,19 @@ msgstr ""
 "Gajim будет уведомлять вас о отсоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim будет лишь менять иконку у контакта, от которого пришло новое сообщение"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1392,7 +1449,7 @@ msgstr ""
 "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и "
 "в окнах комнат"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1400,13 +1457,13 @@ msgstr ""
 "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
 "его именем в окне ростера и в окнах комнат"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
 msgstr "Если отмечено, то Gajim запомнит позицию и размер окна ростера"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1416,7 +1473,7 @@ msgstr ""
 "(например: Контакты с MSN будут иметь соответствующие иконки msn для "
 "статусов в сети, ушел, занят и т.д....)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1424,11 +1481,11 @@ msgstr ""
 "Если отмечено, то Gajim будет заменять текстовые смайлики, например ':)' их "
 "графическим или анимированным эквивалентом"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "_Управление..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1440,80 +1497,84 @@ msgstr ""
 "По учетной записи\n"
 "По типу"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Уведомлять о контактах которые: "
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Сообщать о новых письмах в _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "В _каждой строке"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "Одно _окно сообщения:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Проигрывать _звук"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Выводить время:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "Сохранить _положение и размер ростера и окон бесед"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Показывать только в _ростере"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "В_ошли"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "В_ышли"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Статус"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Сообщение о статусе для авто-отошел"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Сообщение о статусе для авто-недоступен"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Использовать иконки для _транспортов"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Иконка в _трее (или в области уведомления)"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1525,151 +1586,160 @@ msgstr ""
 "что событие соответствующее новому сообщению, не происходит если вы уже "
 "беседуете с контактом"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Когда получено новое сообытие"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Расширенный редактор настроек"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "_После времени:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "_До времени:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "_Менеджер файлов:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "_Шрифт:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "Выделять _слова с опечатками"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "_Входящее сообщение:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_История изменений статуса контактов"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_Почтовый клиент:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Никогда"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Сообщать об этом"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "_Открыть..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "_Исходящее сообщение:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Проигрыватель:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Вывести окно"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "_Вернуться к цветам по умолчанию"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "_Сортировать контакты по статусу"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "_Сообщение о статусе:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "минут"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Личные Беседы"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Формат строки</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "_Соединяться при запуске Gajim"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Удалить"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Сервер:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Черный список"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Подписка"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "В группе"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1677,32 +1747,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Отправить сообщение"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Попросить возможность видеть его или её статус"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Позволить ему или ей видеть мой статус"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Подробнее"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Адрес"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Установить _Аватару"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "День рождения:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Город:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Компания:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Страна:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Отделение:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Почта:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Дополнительный адрес:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Фамилия:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Формат: YYYY-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Имя:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Веб-страница:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Отчество:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Еще"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Редактировать Личную Информацию"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Телефон:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Должность:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Индекс:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Префикс:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Обязанности:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Штат:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Улица:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Суффикс:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Работа"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Опубликовать"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Получить"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1722,47 +1932,58 @@ msgid "A_sk to see his/her status"
 msgstr "Попросить возможность видеть его или её статус"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Добавить специальное _уведомление"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Назначить OpenPGP ключ"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Редактировать группы"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Отправить _Сообщение"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Начать _Чат"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Позволить ему или ей видеть мой статус"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Запретить ему или ей видеть мой статус"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Удалить из ростера"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "П_ереименовать"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Подписка"
 
@@ -1787,42 +2008,53 @@ msgid "Help online"
 msgstr "Помощь онлайн"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Профиль, Аватара"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Транспорты"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Показать _отключенных"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Содержание"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Просмотреть сервисы"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_ЧаВО"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Помощь"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Выйти"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Право говорить"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Вперед"
@@ -1892,22 +2124,18 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Авторизовать контакт (он будет видеть ваш статус)"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "_Информация о Контакте"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "Отклонить авторизацию от контакта (Он не сможет видеть ваш статус)"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Запрос подписки"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Авторизовать"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Отклонить"
 
@@ -1923,164 +2151,51 @@ msgstr "Показать _ростер"
 msgid "Sta_tus"
 msgstr "Ста_тус"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Подробнее"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Адрес"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Спрашивать:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "День рождения:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Город:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Клиент:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Компания:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Информация о контакте"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Страна:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Отделение:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "Почта:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Дополнительный адрес:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Фамилия:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Формат: YYYY-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Имя:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Веб-страница:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Контакты"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Расположение"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Отчество:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Еще"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Телефон:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Должность:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Индекс:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Префикс:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Обязанности:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Установить _Аватару"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Штат:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Улица:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Подписка:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Суффикс:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Работа"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_История сообщения"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Опубликовать"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Получить"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Траффик</b>"
@@ -2112,30 +2227,165 @@ msgstr "_Сообщение"
 msgid "_Presence"
 msgstr "_Присутствие"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Имя:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Имя:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Личная Информация"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Редактировать учетную запись..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Использовать пользовательские хост/порт"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Название опции"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Значение"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Нет)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Скрытый"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Общие"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "зеленый"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Расположение"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Курсив"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Опубликовать"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2152,52 +2402,62 @@ msgstr ""
 "\n"
 "Выделение слов с опечатками выключено"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Чаты"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s: %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не выдал OpenPGP ключ или вы не присвоили ему такового"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Шифрование включено"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Шифрование отключено"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "Не в ростере"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вы получили новое сообщение от \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2205,81 +2465,97 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет потеряно."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Отключено"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Каждые %s _минут"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Активен"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Подключение недоступно"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "заголовок сообщения сервера"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "текст сообщения сервера"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Получено первое сообщение"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Получено следующее сообщение"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Контакт подключился"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Контакт отключился"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Вас упомянули в Комнате"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "Невозможно использовать OpenPGP"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Непросмотренные события"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для смены имени учетной записи необходимо просмотреть ожидающие события."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2287,149 +2563,180 @@ msgstr ""
 "Это имя уже используется в другой вашей учетной записи. Пожалуйста, выберите "
 "другое."
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат \"имя_пользователя@сервер\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Скоро буду."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Переподключиться сейчас?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Если вы хотите чтобы изменения были применены немедленно, вы должны "
 "переподключиться."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Чтобы отредактировать личную информацию, нужно подсоединиться к серверу."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr ""
+"Перед редактированием личных данных необходимо сначала создать учетную "
+"запись."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Есть проблемы с получением вашего OpenPGP секретного ключа."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Выбор OpenPGP ключа"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой OpenPGP ключ"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Просмотрите все ожидающие события переду удалением учетной записи."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "У вас нет активной учетной записи"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Такое имя учетной записи уже используется"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Черный список"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Список участников"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Список владельцев"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Список администрираторов"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Обязанность"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Баню..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2437,11 +2744,11 @@ msgstr ""
 "<b>Кого вы хотите забанить?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Добавляю участника..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2449,11 +2756,11 @@ msgstr ""
 "<b>Кого вы хотите сделать участником?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Добавляю владельца..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2461,11 +2768,11 @@ msgstr ""
 "<b>Кого вы хотите сделать владельцем?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Добавляю администратора..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2473,7 +2780,7 @@ msgstr ""
 "<b>Кого вы хотите сделать администратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2489,89 +2796,90 @@ msgstr ""
 "4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
 "domain/resource, так и адрес, содержащий этот поддомен)"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Учетная запись \"%s\" подключена к серверу"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Новая комната"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Комната"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Пожалуйста, удостоверьтесь, что заполнены поля с именем сервера и комнаты, "
 "либо удалите эту закладку."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Необходимо ввести пароль для новой учетной записи."
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля, должны быть одинаковы."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Дублирующийся Jabber ID"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Этот контакт уже настроен в Gajim."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2580,23 +2888,23 @@ msgstr ""
 "Вы можете настроить ее используя \n"
 "\"Настройка->Учетные записи\" из главного окна."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Ваша новая учетная запись успешно создана"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "У меня уже есть учетная запись с таким именем."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2604,461 +2912,512 @@ msgstr ""
 "Текст под этой линией был сказан после того, как вы последний раз "
 "заглядывали в эту комнату"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Действия для \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _словаре"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL словаря пропущен в \"%s\" и это не WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL Web-поиска отсутствует в \"%s\""
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "%i дней назад"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "На компьютере не установлена библиотека D-Bus для Python"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Возможности работы Gajim с D-Bus не могут быть использованы"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Имя контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Группа"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "В группе"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Имя контакта"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "Сообщение о статусе %s"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Сообщение о статусе"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Сохранить установленное сообщение о статусе"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Введите имя для этого сообщения о статусе"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Адрес:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Адрес:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Дополнительный адрес:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Пожалуйста, заполните данные о вашей уже существующей учетной записи %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Пожалуйста, заполните данные для контакта который вы хотите добавить"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Транспорты"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Неверный ID пользователя"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "ID пользователя не должен содержать ресурс."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Контакт уже в ростере"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Этот контакт уже содержится в вашем ростере."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "ID пользователя:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "Jabber-клиент на GTK+"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Разработчики:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Разработчики:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "И наконец, мы хотели бы поблагодарить всех мейнтейнеров пакетов."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr "переводчики"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr ""
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Запрос на подписку для учетной записи %s от %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Вы уже в комнате %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Войти в комнату с учетной записи %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Неверное имя комнаты или сервера"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Неверный Jabber ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "В имени комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Начать беседу с учетной записью %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Начать беседу"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "Введите ID пользователя которому вы хотите отправить сообщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Соединение невозможно"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Пожалуйста, удостоверьтесь, что вы подключены к \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Чтобы изменить пароль, необходимо подсоединиться к серверу."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Вы должны ввести пароль."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Контакт в сети"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Новое сообщение"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Новое одиночное сообщение"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Новое письмо"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Передача файла завершена"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Приглашение в Комнату"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Контакт отключился"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
+msgstr "Новое сообщение с учетной записи %s"
+
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
 msgstr "Новое сообщение с учетной записи %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Сообщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "Консоль XML"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Описание: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Формат строки</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Формат строки</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Личные Беседы"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s пригласил вас в комнату %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Выберите звуковой файл"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "В формате Wav"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Выбрать картинку"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когда %s происходит:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавление специального уведомления для %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Соединение"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Другие"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Комнаты"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Для просмотра сервисов необходимо сначала подсоединиться к серверу"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Обзор сервисов с использование аккаунта %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Обзор сервисов (discovery)"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Сервис не обнаружен"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3066,46 +3425,51 @@ msgstr ""
 "По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и "
 "попробуйте еще раз."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Сервис недоступен для просмотра"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Просмотр %s с учетной записью %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Браузер"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Пере_регистрировать"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Сканирую %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Пользователи"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Описание"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Файл"
@@ -3123,7 +3487,7 @@ msgstr "Прогресс"
 msgid "Filename: %s"
 msgstr "Имя файла: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
@@ -3131,17 +3495,17 @@ msgstr "Размер: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Вы"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Отправитель: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Получатель:"
 
@@ -3162,78 +3526,88 @@ msgstr "Передача отменена"
 msgid "Connection with peer cannot be established."
 msgstr "Соединение не может быть установлено."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Получатель:"
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Ошибка чтения файла:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Передача файла остановлена контактом на той стороне"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Выбрать файл для отправки..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Нет доступа к файлу"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Файл занят другим процессом."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s хочет отправить вам файл:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Файл уже существует"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Что вы хотите сделать?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Сохранить файл как..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3241,58 +3615,259 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Неверный файл"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Нельзя отсылать пустые файлы"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Имя:  "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Отправитель:"
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim для запуска требуется X-сервер. Выхожу..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim требуется PyGTK 2.6 или выше"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim для запуска требуется PyGTK 2.6 или выше. Выхожу..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim требуется GTK 2.6 или выше"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim для запуска требуется GTK 2.6 или выше. Выхожу..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "У GTK отсутствует поддержка libglade."
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Пожалуйста, удалите вашу текущую версию GTK и установите последнюю "
+"стабильную версию с %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr "Пожалуйста, удостоверьтесь что GTK+ и PyGTK поддерживают libglade."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim для запуска требуется PySQLite2"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim для запуска требуется PySQLite2"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Авторизация для %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Вы принимаете этот запрос?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Соединение"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Тема: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "ошибка при отправке %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Авторизация принята"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr ""
+"Контакт \"%s\" авторизовал вас, теперь вы можете видеть его или её статус."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Контакт \"%s\" отозвал подписку с вами"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Вы всегда будете видеть его или её в оффлайне."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Связь с \"%s\" не может быть установлена"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Проверьте настройки сети или попробуйте еще раз позже."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Ваша парольная фраза неверна"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Вы сейчас соединены без OpenPGP ключа."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Новое Письмо на %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "У вас есть %d непрочитанное сообщение"
+msgstr[1] "У вас есть %d непрочитанных сообщения"
+msgstr[2] "У вас есть %d непрочитанных сообщений"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s хочет отправить вам файл."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Успешно получен файл %(filename)s от %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Передача файла %(filename)s от %(name)s приостановлена."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "%(name)s успешно получил отправленный вами файл %(filename)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Передача файла %(filename)s к %(name)s приостановлена."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Пожалуйста, заполните данные для вашей новой учетной записи</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Не могу сохранить ваши установки и настройки"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Отсутствует поддержка Управления Сессиями (отсутствует модуль gnome.ui)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "показывает помощь для данной команды"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "показать помощь по команде"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Скрывает или показывает окно ростера"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Показывать окно с следующим непрочитанным сообщением"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3300,47 +3875,47 @@ msgstr ""
 "Выводит список всех контактов в ростере. Каждый контакт будет в отдельной "
 "строке"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "Учетные записи"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "показывать контакты только для данной учетной записи"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Показывает список зарегистрированных учетных записей"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Изменить статус учетной записи или записей"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "статус"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "сообщение"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "сообщение сервера"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3349,19 +3924,19 @@ msgstr ""
 "изменить статус всех учетных записей у которых установлена опция "
 "\"синхронизировать с глобальным статусом\""
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Показывает окно беседы, чтобы вы могли отправлять сообщения контакту"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакта с которым вы хотели бы побеседовать"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3372,29 +3947,29 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "содержимое сообщения"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "PGP ключ"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "если указано, сообщение будет зашифровано с использованием открытого ключа"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 "если указано, сообщение будет отправлено с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3405,131 +3980,146 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Тема"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Сообщение отправлено"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Получает детальную информацию о контакте"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID контакта"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Получает детальную информацию о учетной записи"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Имя учетной записи"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Отправляет контакту файл"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Путь до файла"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr ""
 "если указано, файл будет отправлен с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Показывает все параметры с их значениями"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Присваивает 'ключу' в 'значение'"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Удаляет параметр"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "имя параметра который нужно удалить"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Удаляет контакт из ростера"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Добавляет контакт в ростер"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Добавляет новый контакты для данной учетной записи"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Возвращает количество непрочитанных сообщений"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Начать беседу с учетной записью %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "Консоль XML"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент \"JID контакта\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3538,16 +4128,11 @@ msgstr ""
 "'%s' не в вашем ростере\n"
 "Пожалуйста укажите учетную запись для отправки сообщения."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "У вас нет активной учетной записи"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Неизвестная версия D-Bus: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3556,16 +4141,16 @@ msgstr ""
 "Использование: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s не найден"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3574,7 +4159,7 @@ msgstr ""
 "Использование: %s команда [аргумента]\n"
 "Команда одна из:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3583,331 +4168,136 @@ msgstr ""
 "Аргумент \"%s\" не задан. \n"
 "На берите \"%s\" help \"%s\" для справки"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim для запуска требуется X-сервер. Выхожу..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim требуется PyGTK 2.6 или выше"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim для запуска требуется PyGTK 2.6 или выше. Выхожу..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim требуется GTK 2.6 или выше"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim для запуска требуется GTK 2.6 или выше. Выхожу..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "У GTK отсутствует поддержка libglade."
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Пожалуйста, удалите вашу текущую версию GTK и установите последнюю "
-"стабильную версию с %s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Пожалуйста, удостоверьтесь что GTK+ и PyGTK поддерживают libglade."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim для запуска требуется PySQLite2"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Авторизация для %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Вы принимаете этот запрос?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "ошибка при отправке %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Авторизация принята"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr ""
-"Контакт \"%s\" авторизовал вас, теперь вы можете видеть его или её статус."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Контакт \"%s\" отозвал подписку с вами"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Вы всегда будете видеть его или её в оффлайне."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Связь с \"%s\" не может быть установлена"
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Проверьте настройки сети или попробуйте еще раз позже."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Ваша парольная фраза неверна"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Вы сейчас соединены без OpenPGP ключа."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Новое Письмо на %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "У вас есть %d непрочитанное сообщение"
-msgstr[1] "У вас есть %d непрочитанных сообщения"
-msgstr[2] "У вас есть %d непрочитанных сообщений"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s хочет отправить вам файл."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Успешно получен файл %(filename)s от %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Передача файла %(filename)s от %(name)s приостановлена."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "%(name)s успешно получил отправленный вами файл %(filename)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Передача файла %(filename)s к %(name)s приостановлена."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "vCard успешно опубликован"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Ваша информация о себе была успешно опубликована."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "Публикация vCard не удалась"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"При публикации вашей личной информации произошла ошибка, попробуйте позже."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Не могу сохранить ваши установки и настройки"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Отсутствует поддержка Управления Сессиями (отсутствует модуль gnome.ui)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Переношу Историю..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Пожалуйста, дождитесь окончания переноса истории..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Тема"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "имя тeмы"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Вы не можете удалить вашу текущую тему"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Пожалуйста, выберите сначала другую тему."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Личная Беседа"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Личные Беседы"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Вы больше не находитесь в комнате \"%s\" или \"%s\" вышел."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Комната"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Комнаты"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Изменить _ник"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "У комнаты нет темы"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s выгнал %(nick)s из комнаты: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил %(nick)s заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s теперь известен как %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Ник не обнаружен: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "У комнаты нет темы"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Пригласил %(contact_jid)s в %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s не является нормальным JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к ней "
 "префикс /say)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Команды: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3920,19 +4310,19 @@ msgstr ""
 "данный момент находится в комнате, то он/она/оно так же будет выгнан. НЕ "
 "поддерживает пробелы в никах."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 "Использование: /%s <ник>, открывает окно привата с указанным посетителем."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Использование: /%s, очищает текстовое окно."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3941,12 +4331,12 @@ msgstr ""
 "Использование: /%s [причина], закрывает текущее окно или вкладку, с приводя "
 "причину, если она указана."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Использование: /%s, скрывает кнопки беседы."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3955,7 +4345,7 @@ msgstr ""
 "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
 "возможным указанием причины."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -3964,7 +4354,7 @@ msgstr ""
 "Использование: /%s <комната>@<сервер>[/ник], предлагает присоединиться к "
 "комната@сервер, с возможным указанием ника."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3974,7 +4364,7 @@ msgstr ""
 "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из "
 "комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -3983,7 +4373,7 @@ msgstr ""
 "Использование: /%s <действие>, совершает действие в текущей комнате. "
 "Используйте третье лицо (напр. /%s взрывается.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -3992,24 +4382,24 @@ msgstr ""
 "Использование: /%s <ник> [сообщение], открывает окно личной беседы и "
 "отсылает сообщение посетителю с указанным ником."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr ""
 "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4017,78 +4407,78 @@ msgstr ""
 "Использование: /%s <сообщение>, отсылает сообщение без поиска других команд "
 "в нем."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Нет подсказки для /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Вы точно хотите покинуть комнату \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "Не _переспрашивать"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Изменяет Тему"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Пожалуйста, введите новую тему:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Изменяет Ник"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Пожалуйста, введите новый ник который вы хотите использовать:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Закладка уже установлена"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Комната \"%s\" уже есть в ваших закладках."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню \"Действия\" в ростере."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Кикнуть %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Обнаружена ошибка в программе"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4096,88 +4486,88 @@ msgstr ""
 "Возможно это не так страшно, но все равно стоит сообщить об этом "
 "разработчикам."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Сообщить об Ошибке"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Детали"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Ошибка чтения файла:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Ошибка обработки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Не могу писать в %s. Управление сессиями будет недоступно"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Сохранить файл как..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Не могу найти базу данных истории"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Контакты"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Ник"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Сообщение"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Тема"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Вы хотите очистить базу данных? (КРАЙНЕ НЕ РЕКОМЕНДУЕТСЯ ЕСЛИ GAJIM ЗАПУЩЕН)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4191,133 +4581,175 @@ msgstr ""
 "\n"
 "Если вы нажали ДА, пожалуйста подождите..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Экспортирую Историю..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s в %(time)s сказал: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "кто"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Вы точно хотите удалить логи выделенного контакта?"
 msgstr[1] "Вы точно хотите удалить логи выделенных контактов?"
 msgstr[2] "Вы точно хотите удалить логи выделенных контактов?"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Это необратимая операция"
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Вы точно хотите удалить выделенное сообщение?"
 msgstr[1] "Вы точно хотите удалить выделенные сообщения?"
 msgstr[2] "Вы точно хотите удалить выделенные сообщения?"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s теперь %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s теперь %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус установлен в:  %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Сообщения"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s теперь %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s подключился"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s отключился"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Новое Личное Сообщение из комнаты %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Не могу загрузить изображение"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Получено Приглашение"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "Необходимо присоединиться к серверу для обновления личной информации"
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "Публикация vCard не удалась"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"При публикации вашей личной информации произошла ошибка, попробуйте позже."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr ""
+"Необходимо присоединиться к серверу для получения информации о контакте"
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Вы уже в комнате %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости."
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "учетной записи %s"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "используя %s учетную запись"
@@ -4325,41 +4757,53 @@ msgstr "используя %s учетную запись"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Управление закладками..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "для учетной записи %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Войти в новую комнату"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Войти в комнату"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "У вас есть непрочитанные сообщения"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Просмотрите все ожидающие события переду удалением учетной записи."
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" будет удален"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4367,67 +4811,86 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Транспорт \"%s\" будет удален"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"У вас теперь не будет возможности приема и отправки сообщения контактам "
+"через этот транспорт."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Назначить OpenPGP ключ"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ который будет применен к контакту"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Новая комната"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Вы не против если я добавлю Вас себе в ростер?"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "П_ереименовать"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Соединиться"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "_Отключиться"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь \"%s\" будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если \"%s\" примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь \"%s\" всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" будет удален из вашего ростера"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4435,7 +4898,7 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию, то вы будете "
 "видеть его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4443,36 +4906,51 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2334
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу чтобы этот контакт видел мой статус после удаления"
 
-#: ../src/roster_window.py:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Контакт \"%s\" будет удален из вашего ростера"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Если вы удалите контакт, вы так же удалите и авторизацию, то вы будете "
+"видеть его или её всегда в оффлайне."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Требуется парольная фраза"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Введите парольную фразу GPG для учетной записи %s"
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Сохранить парольную фразу (небезопасно)"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Неверная парольная фраза"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Пожалуйста введите парольную фразу для GPG еще раз или нажмите Отмена."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4480,20 +4958,21 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать невидимым?"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Неи доступной учетной записи"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "У вас есть непрочитанные сообщения"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4501,150 +4980,111 @@ msgstr ""
 "Сообщения будут доступны для чтения позже если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Сбросить %s в группе %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Сделать %s и %s метаконтактами"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Изменить Сообщение о Статусе..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Изменить Сообщение о Статусе..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Скрыть это меню"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d непрочитанное сообщение"
-msgstr[1] "Gajim - %d непрочитанных сообщения"
-msgstr[2] "Gajim - %d непрочитанных сообщений"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d непрочитанное сообщение"
-msgstr[1] "Gajim - %d непрочитанных сообщения"
-msgstr[2] "Gajim - %d непрочитанных сообщений"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d непрочитанное одиночное сообщение"
-msgstr[1] "Gajim - %d непрочитанных одиночных сообщения"
-msgstr[2] "Gajim - %d непрочитанных одиночных сообщений"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d непрочитанное сообщение в комнате"
-msgstr[1] "Gajim - %d непрочитанных сообщения в комнате"
-msgstr[2] "Gajim - %d непрочитанных сообщений в комнате"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d непрочитанное личное сообщение"
-msgstr[1] "Gajim - %d непрочитанных личных сообщения"
-msgstr[2] "Gajim - %d непрочитанных личных сообщения"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Должность: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Ранг: "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Статус: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Подписка: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Статус: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Последний статус для %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "C %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "с %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Загрузить"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Передано: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Не начато"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Остановлено"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Завершено"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Ожидание"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Передается"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Этот сервис еще не сообщил информацию о себе"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4652,25 +5092,25 @@ msgstr ""
 "Этот сервис не может предоставить информацию о себе . \n"
 "Похоже что он или неверно настроен или сломан"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Не могу загрузить изображение"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "с %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Ранг: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4678,7 +5118,7 @@ msgstr ""
 "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
 "присутствии не интересна"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4686,39 +5126,26 @@ msgstr ""
 "Вам хочется получать информацию о присутствии контакта, но он или она не "
 "заинтересована в вашей."
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
 #. None
-#: ../src/vcard.py:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Ни вы, ни ваш контакт не желаете знать о присутствии друг друга"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы ожидаете ответа контакта на запрос на подписку"
 
-#: ../src/vcard.py:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
-#: ../src/vcard.py:458
-msgid "Without a connection you can not publish your contact information."
-msgstr "Необходимо присоединиться к серверу для обновления личной информации"
-
-#: ../src/vcard.py:491
-msgid "Without a connection, you can not get your contact information."
-msgstr ""
-"Необходимо присоединиться к серверу для получения информации о контакте"
-
-#: ../src/vcard.py:495
-msgid "Personal details"
-msgstr "Личная Информация"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "создается БД истории"
 
@@ -4743,93 +5170,88 @@ msgstr "%s должен быть файлом, а не директорией"
 msgid "creating %s directory"
 msgstr "создается директория %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "отсутствует библиотека pysqlite2 (или python-pysqlite2). Выхожу..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Сервис недоступен: Gajim не запущен или отключена функция удаленного "
-"управления"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "На машине отсутствует D-Bus или модуль питона для нее"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Шина D-Bus не доступна.\n"
-"Попробуйте прочитать http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Использовать DBus и Сервис Уведомлений для показа уведомлений"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Время в минутах, после которого ваш статус изменится на Отошел."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Автостатус 'Отошел' из-за бездействия пользователя."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Время в минутах, после которого ваш статус изменится на Недоступен."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Автостатус 'Недоступен' из-за бездействия пользователя."
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Обрабатывать пары * / _ как возможные форматирующие символы."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Если True, то не будут удаляться */_. Так что *фыва* будет написано "
 "полужирным шрифтом, но * * удалены не будут"
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Добавлять * и [n] в окно ростера?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4837,11 +5259,11 @@ msgstr ""
 "Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются "
 "вновь."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Сколько минут должны оставаться последние строки из предыдущей беседы."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4849,11 +5271,11 @@ msgstr ""
 "Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в "
 "Mirabilis ICQ)"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Сколько строк хранить для Ctrl+Стрелка вверх"
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4862,23 +5284,23 @@ msgstr ""
 "Введите свою ссылку с %s, в которой %s подменяет слово/фразу или "
 "'WIKTIONARY', что значит: \"использовать wiktionary\"."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием "
 "gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4886,7 +5308,7 @@ msgstr ""
 "Всегда спрашивать перед закрытием окна/вкладки комнаты в этом списке комнат "
 "с разделитем в виде пробела."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4894,7 +5316,7 @@ msgstr ""
 "Никогда не спрашивать перед закрытием окна/вкладки комнаты в этом списке "
 "комнат с разделитем в виде пробела."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4902,31 +5324,31 @@ msgstr ""
 "Указвает имя хоста, которое мы отсылаем при передаче файлов, в случае если "
 "мы за NAT или используется проброс портов."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC утверждает что KiB = 1024 байт, KB = 1000 байт"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Показывать вкладку при одной беседе?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показывать границу вкладки при одной беседе?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Показывать кнопку закрытия на вкладке?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 "Список слов с ; в качестве разделителя, которые будут выделяться в комнате."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4934,11 +5356,11 @@ msgstr ""
 "Если True, то Gajim будет завершаться при нажатии на кнопку закрытия окна. "
 "Эта опция учитывается только если используется иконка для трея."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Если True, то Gajim будет регистрировать xmpp:// при каждом запуске"
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4946,15 +5368,16 @@ msgstr ""
 "Если True, то Gajim иконку на каждой вкладке, которая содержит непрочитанные "
 "сообщения. В зависимости от темы, она может быть анимированной."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Если True, то Gajim будет отображать сообщение о статусе, если оно не "
 "пустое, для каждого контакта под именем контакта в окне ростера"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4962,7 +5385,7 @@ msgstr ""
 "Если True, то Gajim будет запрашивать аватару для каждого контакта у "
 "которого её не было в последний раз или она уже слишком старая."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4971,20 +5394,29 @@ msgstr ""
 "Если False, то вы больше не будете видеть статусную строку в окне беседы, "
 "когда контакт меняет его или её статус и/или сообщение о статусе."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4994,17 +5426,19 @@ msgstr ""
 "(поведение по умолчанию для большинства Менеджеров Окон) когда присутствуют "
 "не просмотренные события."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 не понимает sha данные при входе в комнату, защищенную паролем. "
 "Установите эту опцию в False для того, чтобы запретить отсылку sha данных в "
 "информации для комнат"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5012,7 +5446,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Управляет окном, где помещаются новые сообщения.\n"
 "'всегда' - Все сообщения отправляются в одно окно.\n"
@@ -5023,52 +5457,67 @@ msgstr ""
 "свое окно. Заметьте, что при изменении этого параметра требуется перезапуск "
 "Gajim чтобы изменения вошли в силу."
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Если False, вы больше не будете видеть аватары в окне беседы"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Если True, то нажатие клавиши escape будет закрывать вкладку/окно"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Скрывает кнопки окна комнаты"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Скрывает кнопки в окне беседы"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Скрывает баннер в окне комнаты"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Скрывает баннер в окне беседы"
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "Скрывает список посетителей в окне комнаты"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Костыль для jabberd2"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5076,59 +5525,106 @@ msgstr ""
 "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
 "параметре file_transfer_proxies для передачи файлов"
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Невозможно использовать OpenPGP"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Ем"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Кушаю, так что оставьте сообщение секретарю."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "В кино"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Работаю"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Работаю"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Говорю по телефону"
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Вышел"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Доступен"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Готов Поболтать"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Недоступен"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5137,7 +5633,7 @@ msgstr ""
 "содержит слово из списка muc_highlight_words, или когда сообщение содержит "
 "ваш ник."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5146,96 +5642,204 @@ msgstr ""
 "(эта опция учитывается только тогда, когда notify_on_all_muc_messages "
 "установлено в True)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "зеленый"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "овощной"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "телесный"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "морской"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Неверная парольная фраза"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Ник не обнаружен: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1515
+#, fuzzy
+msgid "You are banned from this room."
+msgstr "Вы уже в комнате %s"
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1527
+#, fuzzy
+msgid "You are not in the members list."
+msgstr "Вы не подключены к серверу"
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy, python-format
+msgid "unsubscribe request from %s"
+msgstr "Запрос на подписку от %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Связь с учетной записью \"%s\" была потеряна"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Требуется переподключение для продолжения приема и отправки сообщений."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Транспорт %s неверно ответил на запрос о регистрации."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Неверный ответ"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не могу соединиться с \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Подключен к серверу %s: %s с %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Проверьте настройки сети или попробуйте еще раз позже"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Ошибка аутентификации с \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Пожалуйста, проверьте правильность логина и пароля."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "Не задана парольная фраза OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы будете подключены к %s без использования OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "невидимка"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "отключен"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "%s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Это сообщение зашифровано]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5244,296 +5848,565 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
-msgid "Unable to load idle module"
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "На компьютере не установлена библиотека D-Bus для Python"
+
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Возможности работы Gajim с D-Bus не могут быть использованы"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "отсутствует библиотека pysqlite2 (или python-pysqlite2). Выхожу..."
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
+"Сервис недоступен: Gajim не запущен или отключена функция удаленного "
+"управления"
+
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "На машине отсутствует D-Bus или модуль питона для нее"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Шина D-Bus не доступна.\n"
+"Попробуйте прочитать http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/connection_handlers.py:581
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Нет"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "кто"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Улица:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Порт: "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "файл"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Событие"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Продолжить"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Удалить"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "Registration information for transport %s has not arrived in time"
+msgid "%0 o'clock"
 msgstr ""
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1454
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 #, fuzzy
-msgid "You are banned from this room."
-msgstr "Вы уже в комнате %s"
+msgid "ten to %1"
+msgstr "Зарегистрировать %s"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
+#: ../src/common/fuzzyclock.py:62
 #, fuzzy
-msgid "You are not in the members list."
-msgstr "Вы не подключены к серверу"
+msgid "Morning"
+msgstr "Работаю"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
 msgstr ""
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Нет"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1521
-#, fuzzy, python-format
-msgid "unsubscribe request from %s"
-msgstr "Запрос на подписку от %s"
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Событие"
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
 msgstr ""
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Неверный символ в имени пользователя."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Требуется адрес сервера."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Неверный символ в имени сервера"
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Неверный символ в ресурсе"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Занят"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Занят"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Недоступен"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Недоступен"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Готов Поболтать"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Готов Поболтать"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Доступен"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Доступен"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Соединяюсь"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "_Ушел"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Ушел"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Отключен"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Отключен"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "_Невидимка"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "Ошибка"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "К"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "От"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Оба"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "Отсутствует"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Модераторы"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Участники"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Посетитель"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Отсутствует"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Владелец"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Администрирование"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Участник"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "читает сообщение"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "занят чем-то еще"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "печатает сообщение..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "прервал печать сообщения"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "закрыл окно чата или вкладку"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d непрочитанное сообщение"
+msgstr[1] "Gajim - %d непрочитанных сообщения"
+msgstr[2] "Gajim - %d непрочитанных сообщений"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d непрочитанное одиночное сообщение"
+msgstr[1] "Gajim - %d непрочитанных одиночных сообщения"
+msgstr[2] "Gajim - %d непрочитанных одиночных сообщений"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d непрочитанное сообщение в комнате"
+msgstr[1] "Gajim - %d непрочитанных сообщения в комнате"
+msgstr[2] "Gajim - %d непрочитанных сообщений в комнате"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d непрочитанное личное сообщение"
+msgstr[1] "Gajim - %d непрочитанных личных сообщения"
+msgstr[2] "Gajim - %d непрочитанных личных сообщения"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "ошибка: не могу открыть %s для чтения"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "синий"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "создается БД истории"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "для учетной записи %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Не могу загрузить изображение"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Не могу соединиться с \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Это сообщение зашифровано]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Подписаться"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Адрес"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Ушел"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Загрузить"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Добавление специального уведомления для %s"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Недоступен"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Удалить"
+
+#~ msgid "Contact _Info"
+#~ msgstr "_Информация о Контакте"
+
+#~ msgid "Contact Information"
+#~ msgstr "Информация о контакте"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Неверное имя комнаты или сервера"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Неизвестная версия D-Bus: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "vCard успешно опубликован"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Ваша информация о себе была успешно опубликована."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Переношу Историю..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Пожалуйста, дождитесь окончания переноса истории..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Войти в новую комнату"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Скрыть это меню"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d непрочитанное сообщение"
+#~ msgstr[1] "Gajim - %d непрочитанных сообщения"
+#~ msgstr[2] "Gajim - %d непрочитанных сообщений"
+
+#~ msgid "Since %s"
+#~ msgstr "C %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Автоматически авторизовать контакт"
 
diff --git a/po/sk.po b/po/sk.po
index 4be9bf709..93a97fea7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the gajim package.
 # Juraj Michalek <juraj.michalek@asinus.org>, 2005.
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-06-19 22:44+0100\n"
 "Last-Translator: Juraj Michalek <juraj.michalek@asinus.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -20,15 +20,15 @@ msgstr ""
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-Country: SLOVAKIA\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber klient"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Gajim Instant Messenger"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
@@ -46,16 +46,23 @@ msgid "_Discover Services..."
 msgstr "_Preskúmať služby..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "Skupinový rozhovor"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Upraviť účet..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Otvoriť nový e-mail"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stav"
 
@@ -109,7 +116,7 @@ msgid "Pass_word:"
 msgstr "He_slo:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Uložiť hes_lo"
 
@@ -135,7 +142,7 @@ msgid "Your JID:"
 msgstr "Vaše JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Rozšírené"
 
@@ -149,7 +156,7 @@ msgid "_Host:"
 msgstr "_Server:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Heslo:"
 
@@ -181,10 +188,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Rôzne</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Osobné informácie</b>"
 
@@ -201,6 +210,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Automatické pripojenie po strate spojenia"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "_Pripojiť Gajim pri štarte"
 
@@ -220,6 +230,7 @@ msgstr ""
 "poskytované serverom. Pri povolení tejto vlastnosti bude TLS deaktivované."
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Vyberte _kľúč"
 
@@ -236,16 +247,16 @@ msgid "Edit Personal Information..."
 msgstr "Upraviť osobné informácie..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Všeobecné"
 
@@ -268,6 +279,7 @@ msgstr ""
 "predchádza vypršaniu platnosti spojenia, ktorého výsledkom je odpojeni"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -276,6 +288,7 @@ msgstr ""
 "len pre vás"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -284,6 +297,7 @@ msgstr ""
 "tento účet"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -300,18 +314,23 @@ msgstr "Informácie o vás sú uložené na serveri"
 msgid "Manage..."
 msgstr "Upraviť..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Žiadny kľúč nie je vybraný"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Nič"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Osobné informácie"
 
@@ -334,14 +353,18 @@ msgstr ""
 "najvyššou priritou obdrží udalosť"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Zd_roj:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -355,41 +378,47 @@ msgstr ""
 "so zdrojmi ako 'Doma' alebo 'V práci', v rovnakom čase. Zdroj z najvyššou "
 "prioritou získava udalosti (viď nižšie)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Uložiť _passfrázy (nie je bezpečné)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Uložiť _záznam z rozhovoru pre všetky účty"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Poslať pakety na udržiavanie spojenia (keep-alive)"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Syhch_ronizovať stav účtu s globálnym stavom"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Použiť _SSL (historické dôvody)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Použiť vlastné nastavenie server/port"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 #, fuzzy
 msgid "Use file transfer proxies"
 msgstr "zoznam prenosu súborov"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Meno:"
 
@@ -399,63 +428,92 @@ msgstr "Účty"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Ak máte dva alebo viac účtov a je zaškrtnuté, Gajim bude vypisovať všetky "
 "kontakty akoby ste mali len jeden účet"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Zlúčiť účty"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Upraviť"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "_Odstrániť"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Účet"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Povoliť jemu/jej vidieť môj stav"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Pridať nový kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Chcem si ťa pridať do môjho kontakt listu."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Účet"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Skupina:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Prezývka:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protokol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Zapísať"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Re_gistrácia"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "Používateľské ID:"
@@ -547,82 +605,63 @@ msgstr "<b>Zvuky</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Adresa"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "_Rozšírené akcie"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Rozšírený editor na editovanie konfigurácie"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Stav:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Preč"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Zaneprázdnený"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Stiahnuť"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Neviditeľný"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "príkaz"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Pridať špeciálne na %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Neprítomný"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Mám čas na debatu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Prehrať _zvuky"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -635,74 +674,74 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable auto opening chat window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Použiť jedno okno na rozhovor so _záložkami"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Zobraziť len v _zozname"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Zobraziť len v _zozname"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Port: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -737,7 +776,7 @@ msgstr "_Pripojiť sa k skupinovej diskusii"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Pridať do zoznamu"
 
@@ -758,7 +797,8 @@ msgid "_Open Link in Browser"
 msgstr "_Otvoriť vo web prehliadači"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Začať rozhovor"
@@ -768,7 +808,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Kliknite pre zobrazenie poslednej konverzácie s kontaktom"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Poslať _súbor"
 
@@ -784,7 +825,8 @@ msgstr "_Kompaktný pohľad    Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_História"
 
@@ -848,7 +890,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Keď je prenos súboru dokončené zobraziť popup upozornenie"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Pokračovať"
 
@@ -885,66 +927,61 @@ msgstr ""
 "Transparent"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Aktívne"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Tučné"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Štýl fontu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Úprava tém Gajimu"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 #, fuzzy
 msgid "Gone"
 msgstr "Nič"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 #, fuzzy
 msgid "Inactive"
 msgstr "Aktívne"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Kurzíva"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 #, fuzzy
 msgid ""
 "MUC\n"
 "Messages"
 msgstr "Správy"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Pauza"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "Farba _textu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "_Písmo:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Pozadie:"
 
@@ -1063,7 +1100,7 @@ msgid "Accept"
 msgstr "Prijať"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Zakázať"
 
@@ -1071,13 +1108,14 @@ msgstr "Zakázať"
 msgid "Invitation Received"
 msgstr "Prijaté pozvanie"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Pripojiť sa ku skupinovému rozhovoru"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Prezývka:"
 
@@ -1095,13 +1133,8 @@ msgstr "Posledné:"
 msgid "Room:"
 msgstr "Miestnosť:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Pripojiť"
 
@@ -1126,6 +1159,10 @@ msgstr "Upraviť záložky"
 msgid "Print status:"
 msgstr "Čas tlače:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Server:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Titul:"
@@ -1147,7 +1184,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Upraviť Proxy nastavenia"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Meno:"
 
@@ -1163,20 +1201,21 @@ msgstr "Použiť autentifikáciu"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Kliknite pre vloženie emotikonu (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP šifrovanie"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Akcie"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Poslať"
 
@@ -1251,18 +1290,25 @@ msgid "Also known as iChat style"
 msgstr "Tiež známy ako iChat štýl"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Vyžiadať správu o stave, keď som:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Automaticky _preč po:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Automaticky _neprítomný(á) po:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1274,20 +1320,20 @@ msgstr ""
 "Vždy použiť aplikácie prostredia KDE ako predvolené\n"
 "Vlastné"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid "B_efore nickname:"
 msgstr "Pred prezývkou:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Rozhovor"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Zmeniť upozornen_ie na stav:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1297,39 +1343,44 @@ msgstr ""
 "spamuje/otravuje. Použitím tejto možnosti zablokujete všetky správy od "
 "kohokoľvek, koho nemáte v zozname."
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Správa o stave"
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default status _iconset:"
 msgstr "Základná _sada ikoniek:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Zobraziť avatarov kontaktov v zozname"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Zobraziť stavovú správu kontaktov v zozname"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 #, fuzzy
 msgid "E_very 5 minutes"
 msgstr "Každých 5 _minút"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Emotikony:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Udalosti"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1339,12 +1390,12 @@ msgstr ""
 "vašim kontaktom. Tu môžete vybrať stavy, o ktorých majú byť odosielané "
 "informácie druhej strane."
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr "Gajim automaticky zobrazí novo prijaté správy v pop-up okne"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1352,7 +1403,7 @@ msgstr ""
 "Gajim vás bude upozorňovať na nové udalosti prostredníctvom popup v pravej "
 "spodnej časti obrazovky"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1360,7 +1411,7 @@ msgstr ""
 "Gajim vás bude upozorňovať cez popup v pravej spodnej časti obrazovky o "
 "kontaktoch, ktoré sa práve pripojili"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1368,19 +1419,25 @@ msgstr ""
 "Gajim vás bude upozorňovať popup v pravej spodnej časti obrazovky na "
 "kontakty, ktoré sa práve odpojili"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim bude len meniť ikony kontaktov, ktoré spustili novú udalosť"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr "Ak je zaškrtnuté, Gajim bude zobrazovať avatarov v zozname"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1389,7 +1446,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať správu o stave kontaktov pod menom v "
 "zozname"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1397,7 +1454,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim si bude pamätať pozície a veľkosť zoznamu a "
 "diskusných okien na obrazovke a pri ďalšom spustení ich znova nastaví"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1407,7 +1464,7 @@ msgstr ""
 "kontakt z MSN bude mať ekvivalentné ikonky pre stavy online, preč, "
 "zaneprázdnený, atď...)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1415,12 +1472,12 @@ msgstr ""
 "Ak nie je zaškrtnuté, Gajim nahradí ascii emotikony ako ':)' ekvivalentným "
 "grafickým obrázkom"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Upraviť..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1432,82 +1489,86 @@ msgstr ""
 "Podľa účtu\n"
 "Podľa typu"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Upozorni ma na kontakt, ktorý:"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Upozorniť keď príde _Gmail e-mail"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "Pri každej _správe"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "Jedno _okno so správou:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "Prehrať _zvuky"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Čas tlače:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "Uložiť _pozíciu a veľkosť zoznamu a diskusného okna"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Zobraziť len v _zozname"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "Prihlásiť _sa"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_Odhlásiť sa"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "T_heme:"
 msgstr "Téma:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Správa pri automatickej zmene stavu na Preč"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Správa pri automatickej zmene stavu na Neprítomný(á)"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "Použiť _transportnú sadu obrázkov"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Ikonka v paneli (tj. v upozorňovacej oblasti)"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1519,162 +1580,171 @@ msgstr ""
 "Upozornenie na nové správy sa zobrazí len v prípade, ak s kontaktom už "
 "nediskutujete"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "Keď je prijatá nová udalosť"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Rozšírený editor na editovanie konfigurácie"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "_After time:"
 msgstr "Po čase:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 #, fuzzy
 msgid "_Before time:"
 msgstr "Pred časom:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Prechádzať:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 #, fuzzy
 msgid "_File manager:"
 msgstr "Správca súborov:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 #, fuzzy
 msgid "_Font:"
 msgstr "Font:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Zvýrazniť zle napísané slová"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovať udalosti od kontaktov, ktorí nie sú v zozname"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Prichádzajúca správa:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_E-mailový klient:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Upozorni ma na to"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "_Open..."
 msgstr "Otvoriť..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Odchádzajúca správa:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Prehrávač:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Popup"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Návrat Pôvodného nastavenia farieb"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 #, fuzzy
 msgid "_Sort contacts by status"
 msgstr "Zotriediť kontakty podľa stavu"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 #, fuzzy
 msgid "_Status message:"
 msgstr "Správa o stave:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minuty"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Súkromné rozhovory"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Formát riadku rozhovoru</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "_Pripojiť Gajim pri štarte"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Zmazať"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Čierna listina"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Požiadavky"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "V skupine"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1682,32 +1752,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Poslať správu"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Požiadať jeho/ju o súhlas pre zobrazenie stavu"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Povoliť jemu/jej vidieť môj stav"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Informácie"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adresa"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Nastaviť _avatara"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Narodeniny:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Mesto:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Spoločnosť:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Krajina:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Oddelenie:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Extra adresa:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Priezvisko:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Formát: YYYY-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Meno:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Domovská stránka:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Prostredné meno:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Viac"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Osobné informácie"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefónne č.:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Pozícia:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "PSČ:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Prefix:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Rola:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Stav:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Ulica:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Titul za:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Práca"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Zverejniť"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Získať"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1727,47 +1937,58 @@ msgid "A_sk to see his/her status"
 msgstr "Požiadať jeho/ju o súhlas pre zobrazenie stavu"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Pridať špeciálne _upozornenie"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Prideliť Open_PGP kľúč"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Upraviť _Skupiny"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Poslať jednoduchú _správu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Začať _rozhovor"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Povoliť jemu/jej vidieť môj stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Odmietnuť zobraziť stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "_Odstrániť zo zoznamu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Požiadavky"
 
@@ -1792,42 +2013,53 @@ msgid "Help online"
 msgstr "Online pomoc"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Profil, Avatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transporty"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Zobraziť _offline kontakty"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Obsah dokumentácie"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Preskúmať služby"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_Často kladené otázky"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Nastavenia"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Koniec"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Hlas"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "Ch_oď"
@@ -1897,24 +2129,20 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorizovať kontakt, od teraz vude vidieť kedy ste pripojený(á)"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "Kontaktné _info"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Zamietnuť autorizáciu od kontaktu, nebude tým pádom vedieť, kedy ste "
 "pripojený(á)"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Požiadavka o zapísanie"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Autorizovať"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Zakázať"
 
@@ -1930,164 +2158,51 @@ msgstr "Zobraziť _zoznam"
 msgid "Sta_tus"
 msgstr "S_tav"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Informácie"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adresa"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Požiadať:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Narodeniny:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Mesto:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Spoločnosť:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Kontaktné informácie"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Krajina:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Oddelenie:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Extra adresa:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Priezvisko:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Formát: YYYY-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Meno:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Domovská stránka:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "_Obsah dokumentácie"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Miesto"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Prostredné meno:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Viac"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "Operačný systém:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Telefónne č.:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Pozícia:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "PSČ:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Prefix:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Rola:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Nastaviť _avatara"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Stav:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Ulica:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Zápis:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Titul za:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Práca"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "História _konverzácie"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Zverejniť"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Získať"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Prevádzka Jabber-a</b>"
@@ -2119,30 +2234,165 @@ msgstr "_Správa"
 msgid "_Presence"
 msgstr "_Prítomnosť"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Meno:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Meno:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Osobné detaily"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Upraviť účet..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Použiť vlastné nastavenie server/port"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Meno vlastnosti"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Nič)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Skryté"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Všeobecné"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "zelená"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Miesto"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Kurzíva"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Zverejniť"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2159,278 +2409,333 @@ msgstr ""
 "\n"
 "Zvýrazňovanie zle napísaných slov nebude používané"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Vašu správu nie je možné odoslať, pokiaľ nebudete pripojený(á)"
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Rozhovory"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(who)s o %(time)s povedal(a): %(message)s\n"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s nezverejnil svoj OpenPGP kľúč, alebo nemá žiadny vytvorený"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Šifrovanie zapnuté"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Šifrovanie vypnuté"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "Nie je v zozname"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Práve ste prijal(a) novú správu od \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "Ak zatvoríte túto záložku a máte deaktivovanú históriu, správa bude stratená."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Vypnuté"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minút"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Aktívne"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Pripojenie nie je dostupné"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "text správy o stave"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Prvá prijatá správa"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Ďalšia prijatá správa správa"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Kotakt pripojený"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Kontakt odpojený"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Správa odoslaná"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznenie správy v skupinovej diskusii"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa v skupinovej diskusii"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Ste pripojený(á) na server"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Názov účtu je už používané"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Nesprávny názov účtu"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Názov účtu nemôže byť prázdny."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Názov účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabbe ID musí byť v tvare \"používateľ@menoserveru\""
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Port musí byť číslo."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Prihlásiť znovu?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ak chcete, aby boli všetky zmeny naraz aplikované, musíte sa znovu prihlásiť."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Taký účet nie je k dispozícii"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr "Musíte si vytvoriť účet, aby ste mohli meniť osobné informácie."
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený na server"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "Musíte si vytvoriť účet, aby ste mohli meniť osobné informácie."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa získať tajné kľúče"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Vznikol problém pri získavaní vášho OpenPGP tajného kľúča."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Nemáte žiadny aktívny účet"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Názov účtu je už používané"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Upraviť %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Čierna listina"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Zoznam členov"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Zoznam správcov"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Dôvod"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Prezývka"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Rola"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Zakazujem..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2438,11 +2743,11 @@ msgstr ""
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Pridáva sa člen..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2450,11 +2755,11 @@ msgstr ""
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Pridáva sa vlastník..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2462,11 +2767,11 @@ msgstr ""
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Pridáva sa Administrátor..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2474,7 +2779,7 @@ msgstr ""
 "<b>koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2490,91 +2795,92 @@ msgstr ""
 "4. doména (doména sama o sebe, ľubovoľný používateľ@doména,\n"
 "doména/zdroj, alebo adresa obsahujúca subdoménu."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuje sa účet %s"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nová miestnosť"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Skupinový rozhovor"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Prosim, uistite sa, že je vyplnená položka server a miestnosť alebo "
 "odstráňte túto záložku."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Musíte vložiť meno používateľa pre konfuguráciu tohoto účtu."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Musíte vložiť heslo pre nový účet."
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí musia zhodovať."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2583,23 +2889,23 @@ msgstr ""
 "možnosti, alebo neskôr kliknutím na položku Účty v menu Upraviť, v hlavnom "
 "okne"
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol vytvorený úspešne"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Nastala chyba pri vytváraní účtu"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Názov účtu je už používané"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2607,467 +2913,518 @@ msgstr ""
 "Text pod touto čiarou bol povedaný za dobu čo ste jej nevenovali pozornosť "
 "skupinovému rozhovoru"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Akcie pre \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Vyhľadať to v _Slovníku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL Slovníka chýba \"%s\" a nie je WIKTIONÁRNE"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pre web vyhľadávanie chýba \"%s\""
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Včera"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "Pred %i dňami"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python väzby chýbajú na tomto počítači"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus vlastnosti programu Gajim nemôžu byť použité"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Meno kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "V skupine"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "ID kľúča"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Kontaktné meno"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Správa o stave"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Správa o stave"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Uložiť ako prednastavenú správu o stave"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Zadajte prosím názov pre túto stavovú správu"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Adresa:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Adresa:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Extra adresa:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplnte údaje o kontakte, ktorý chcete pridať do účtu %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplnte údaje o kontakte, ktorý chcete pridať"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Nespravné ID používateľa"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "ID používateľa nesmie obsahovať zdroj."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Kontakt je už v zozname"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "Používateľské ID:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klient"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Bývalí vývojári:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Bývalí vývojári:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "POĎAKOVANIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "V neposlednom rade ďakujeme všetkým správcom balíkov (package maintainers)"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr ""
 "Juraj Michálek (juraj.michalek AT asinus.org)\n"
 "Peter Trško (dogmat AT dogmat.us)"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Nie je možné vstúpiť do miestnosti"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Požiadavka na prihlásenie pre účet %s od %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Už ste v miestnosti %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásený(á)"
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pripojiť sa ku skupinovému rozhovoru s účtom %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Nesprávny názov miestnosti alebo serveru"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Nespravné Jabber ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Názov miestnosti alebo meno servera obsahuje nepovolené znaky"
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začať rozhovor s účtom %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Vyplnte ID kontaktu, ktorému chcete\n"
 "odoslať správu:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený(á) k \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Kontakt sa prihlasil"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odhlásil"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Nová správa"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Nová jednoduchá správa"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Nová privátna správa"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Skupinová diskusia - rola: Nič"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Kontakt sa odhlásil"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
 msgstr "Jednoduchá správa s účtom %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
+msgstr "Jednoduchá správa s účtom %s"
+
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Jednoduchá správa"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Prijatý %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "XML konzola"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Popis: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formát riadku rozhovoru</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formát riadku rozhovoru</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Súkromné rozhovory"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s vás pozval do miestnosti %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Wav zvuky"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Vyberte obrázok"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "Keď %s sa stane:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Pridať špeciálne na %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Spojenie"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Ostatný"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Konferencia"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez pripojenia, nemôžete prehľadávať dostupné služby"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prehľadávanie služieb s použitím účtu %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Prehľadávanie služieb"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Služba nebola nájdená"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3075,46 +3432,51 @@ msgstr ""
 "Žiadna služba Nie je k dispozícii na zadanej adrese alebo neodpovedá. "
 "Skontrolujte adresu a skúste opäť."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Služba nie je prehľadávateľná"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žiadne položky na prehľadávanie."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Prehľadávanie %s s použitím účtu %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Prehľadávať"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Táto služba neobsahuje žiadne položky."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Prieskum %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Používatelia"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Popis"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Súbor"
@@ -3132,7 +3494,7 @@ msgstr "Stav"
 msgid "Filename: %s"
 msgstr "Názov súboru: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Veľkosť: %s"
@@ -3140,17 +3502,17 @@ msgstr "Veľkosť: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Odosielateľ: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Príjemca:"
 
@@ -3171,78 +3533,88 @@ msgstr "Prenos súboru bol zrušený"
 msgid "Connection with peer cannot be established."
 msgstr "Spojenie s druhou stranou nie je možné nadviazať."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Príjemca:"
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Chyba čítania súboru:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Prenos súboru bol zastavený druhou stranou"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Vyberte súbor na odoslanie..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemôže pristupovať k tomuto súboru"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Tento súbor je používaný iným procesom."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Súbor: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vám chce poslať súbor:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Tento súbor už existuje"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Čo si prajete vykonať?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Uložiť súbor ako..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3250,58 +3622,260 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Nesprávny súbor"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Súbor: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Meno: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Odosielateľ: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim potrebuje Xserver pre svoj beh. Ukončujem..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim potrebuje PyGTK 2.6+ alebo novšie"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim potrebuje PyGTK 2.6+ alebo novšie pre svoj beh. Ukončujem..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim potrebuje GTK 2.6+ alebo novšie"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim potrebuje GTK 2.6+ alebo novšiu pre svoj beh. Ukončujem..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ prostredie nemá podporu libglade"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Prosím, odstráňte vašu aktuálnu verziu GTK+ prostredia a nainštalujte si "
+"poslednú stabilnú verziu z %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Prosím, uistite sa, že GTK+ a PyGTK majú podporu pre libglade vo vašom "
+"systéme."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim potrebuje PySQLite2 pre svoj beh"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim potrebuje PySQLite2 pre svoj beh"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autorizácia pre %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Akceptujete túto požiadavku?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Spojenie"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Predmet: %s\n"
+
+#: ../src/gajim.py:654
+#, fuzzy, python-format
+msgid "error while sending %s ( %s )"
+msgstr "chyba pri odosielaní"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Autorizácia akceptovaná"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr ""
+"Kontakt \"%s\" vás autorizoval, aby ste mohol(a) vidieť jeho alebo jej stav."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" vás odobral zo svojho zoznamu"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Vždy uvidíte jeho alebo ju ako offline."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Spojenie s \"%s\" nie je možné nadviazať"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Skontrolujte svoje pripojenie alebo skúste neskôr."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s je teraz %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Vaša passfráza je nesprávna"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Momentálne ste pripojený(á) bez vášho OpenPGP kľúča."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "%(new_mail_gajim_ui_msg)s na %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Máte %d novú E-mailovú správu"
+msgstr[1] "Máte %d nových E-mailových správ"
+msgstr[2] "Máte %d nových E-mailových správ"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s vám chce poslať súbor."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Úspešne ste prijali(a) súbor %(filename)s od %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Úspešne odoslaný súbor %(filename)s pre %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Prosím, vyplnte údaje o vašom účte</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Nie je možné uložiť nastavenia."
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "Podpora Správy sedenia nie je dostupná (chýba modul gnome.ui)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "ukáže pomoc pre konkrétný príkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "príkaz"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "ukáž pomoc pre príkaz"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Ukázať alebo skryť okno so zoznamom"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Zobraz popup okno s ďalšou neprečítanou správou"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3309,47 +3883,47 @@ msgstr ""
 "Vypíše zoznam všetkých kontaktov v zozname. Každý kontakt bude na "
 "samostatnom riadku"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "účet"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "zobraziť len kontakty daného účtu"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše zoznam registrovaných účtov"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Zmeniť stav účtu alebo účtov"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: offline, online, chat, preč, diskutovať, zaneprázdnený, neviditeľný"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "správa"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "správa o stave"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3357,19 +3931,19 @@ msgstr ""
 "zmeniť stav účtu \"účet\". Ak nie je špecifikovaný, pokús sa zmeniť všetky "
 "účty, ktoré majú nastavenú vlastnosť \"synchronizácia s globálnym stavom\""
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Zobrazí diskusné okno, takže môžete odoslať správu kontaktu"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, s ktorým chcete komunikovať"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ak je špecifikované, kontakt je zobraný zo zoznamu pre tento účet"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3380,28 +3954,28 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, ktorý prijme správu"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "obsah správy"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "pgp kľúč"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ak je špecifikovaný, správa bude zašifrovaná s použitím verejného kľúča"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "ak je špecifikovaný, správa bude odoslaná s použitím tohoto účtu"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3412,128 +3986,143 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Predmet:"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Správa odoslaná"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Získať detailné informácie o kontakte"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Získať detailné informácie o účte"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Názov účtu"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Poslať súbor kontaktu"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "súbor"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "ak je špecifikovaný, súbor bude odoslaný s použitím tohto účtom"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Výpis všetkých nastavení a ich hodnôt"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastavuje hodnotu 'kľúča' na 'hodnotu'."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "kľúč=hodnota"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'kľúč' je meno vlastnosti, 'hodnota' je hodnota, na ktorú má byť nastavený"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Zmazať položku z nastavenia"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "kľúč"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "názov nastavenia ktoré má byť zmazané"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuálny stav nastavení programu Gajim do súboru .config"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Pridá kontakt do zoznamu"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Pridá nový kontakt pre tento účet"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vráti aktuálny stav (použije sa globálny, pokiaľ nie je vybraný účet)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Vráti aktuálnu správu o stave (použije sa globálny, pokiaľ nie je vybraný "
 "účet)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Vráti počet neprečítaných správ"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Začať rozhovor s účtom %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "XML konzola"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Chýbajúci argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3542,16 +4131,11 @@ msgstr ""
 "'%s' nie je vo vašom zozname.\n"
 "Prosím, špecifikujte účet, z ktorého odoslať správu."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Neznáma verzia D-Bus: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3560,16 +4144,16 @@ msgstr ""
 "Použitie: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s nenájdený"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3578,7 +4162,7 @@ msgstr ""
 "Použitie: %s príkaz [argumenty]\n"
 "Príkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3587,332 +4171,136 @@ msgstr ""
 "Argument \"%s\" nie je špecifikovaný. \n"
 "Zadajte \"%s help %s\" pre viac informácií"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim potrebuje Xserver pre svoj beh. Ukončujem..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim potrebuje PyGTK 2.6+ alebo novšie"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim potrebuje PyGTK 2.6+ alebo novšie pre svoj beh. Ukončujem..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim potrebuje GTK 2.6+ alebo novšie"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim potrebuje GTK 2.6+ alebo novšiu pre svoj beh. Ukončujem..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ prostredie nemá podporu libglade"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Prosím, odstráňte vašu aktuálnu verziu GTK+ prostredia a nainštalujte si "
-"poslednú stabilnú verziu z %s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Prosím, uistite sa, že GTK+ a PyGTK majú podporu pre libglade vo vašom "
-"systéme."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim potrebuje PySQLite2 pre svoj beh"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autorizácia pre %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Akceptujete túto požiadavku?"
-
-#: ../src/gajim.py:611
-#, fuzzy, python-format
-msgid "error while sending %s ( %s )"
-msgstr "chyba pri odosielaní"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Autorizácia akceptovaná"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr ""
-"Kontakt \"%s\" vás autorizoval, aby ste mohol(a) vidieť jeho alebo jej stav."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" vás odobral zo svojho zoznamu"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Vždy uvidíte jeho alebo ju ako offline."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Spojenie s \"%s\" nie je možné nadviazať"
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Skontrolujte svoje pripojenie alebo skúste neskôr."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s je teraz %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Vaša passfráza je nesprávna"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Momentálne ste pripojený(á) bez vášho OpenPGP kľúča."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, fuzzy, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "%(new_mail_gajim_ui_msg)s na %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Máte %d novú E-mailovú správu"
-msgstr[1] "Máte %d nových E-mailových správ"
-msgstr[2] "Máte %d nových E-mailových správ"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s vám chce poslať súbor."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Úspešne ste prijali(a) súbor %(filename)s od %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Úspešne odoslaný súbor %(filename)s pre %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "zverejnenie vCard úspešné"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Vaše osobné informácie boli úspešne zverejnené."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "zverejnenia vCard zlyhalo"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Nastala chyba pri zverejňovaní vašich osobných údajov, skúste prosím neskôr."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Nie je možné uložiť nastavenia."
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Podpora Správy sedenia nie je dostupná (chýba modul gnome.ui)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Presúvanie záznamov histórie..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Prosím počkajte, pokým prebieha migrácia záznamov z komunikácie..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Téma"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "názov témy"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Nemôžete zmazať aktuálnu tému"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Prosím, vyberte najskôr inú tému."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Súkromný rozhovor"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Súkromné rozhovory"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Nie ste už pripojený(á) do miestnosti \"%s\" alebo \"%s\" odišiel(a)."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Skupinový rozhovor"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Skupinové diskusie"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Zmeniť _prezývku"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Táto miestnosť nemá nastavenú tému"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s bol vykopnutý - %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s bol zakázaný - %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy(a) ako %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s je známy(a) ako %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je teraz %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Prezývka nenájdená: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Táto miestnosť nemá nastavenú tému"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozvaný(á) %(contact_jid)s do %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevyzerá ako správny JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Neznámy príkaz: /%s (ak chcete toto odoslať, zaraďte /say pred to, čo "
 "hovoríte)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Príkazy: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3924,19 +4312,19 @@ msgstr ""
 "človeka môže byť zmenená, ale nesmie obsahovať \"@\". Ak je JID práve v "
 "miestnosti, on/ona/ono bude vykoponutý(á). Nepodporuje medzery v prezývkach."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 "Použitie: /%s <prezývka>, otvorí okno na súkromnú komunikáciu s človekom."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použiteie: /%s, vyčistí textové okno."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3945,12 +4333,12 @@ msgstr ""
 "Použitie: /%s [dôvod], zatvorí aktuálnu záložku v okne a zobrazí "
 "zdôvodnenie, pokiaľ je špecifikované."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Použiteie: /%s, vyčistí textové okno."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3959,7 +4347,7 @@ msgstr ""
 "Použitie: /%s <JID> [dôvod], pozve JID do aktuálnej miestosti, prípadne sa "
 "zobrazí aj oddôvodnenie."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -3968,7 +4356,7 @@ msgstr ""
 "Použitie: /%s <miestnosť>@<server>[/prezývka], ponúkne možnosť pripojiť sa "
 "do miestnosť@server pre nick, ak je špecifikovaný."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3978,7 +4366,7 @@ msgstr ""
 "Použitie: /%s <prezývka> [dôvod], odstráni navštevníka z miestnosti podľa "
 "prezývky, prípadne zobrazí dôvod. Nepodporuje medzery v menách."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -3987,7 +4375,7 @@ msgstr ""
 "Použitie: /%s <akcia>, odošle akciu pre aktuálnu miestnosť. Používajte "
 "tretiu osobu. (napr. /%s exlodoval(a).)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -3996,99 +4384,99 @@ msgstr ""
 "Použitie: /%s <prezývka> [správa], otvorí okno na súkromnú komunikáciu a "
 "prípadne odošle správu členovi s prezývkou."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Použitie: /%s <prezývka>, zmení prezývku v aktuálnej miestnosti."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "Použitie: /%s [téma], zobrazí alebo zaktualizuje tému v miestnosti."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Použitie: /%s [téma], zobrazí alebo zaktualizuje tému v miestnosti."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Použitie: /%s <správa>, odošle správu, bezohľadu na ďalšie príkazy."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žiadne informácie s pomocou pre /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Ste si istý(á), že chcete opustiť miestnosť \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Ak zatvoríte okno, budete odpojený(á) z tejto miestnosti."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "Znovu sa už _nepýtať"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Zmena predmetu"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Prosím, špecifikujte nový predmet:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Zmena prezývky"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavená"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Miestnosť \"%s\" je už vo vašich záložkách."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Záložka bola úspešne pridaná"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Môžete spravovať záložky cez Akcie v menu vo vašom zozname."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Môžete špecifikovať dôvod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Zakázať %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Bola detekovaná chyba v programe"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4096,92 +4484,92 @@ msgstr ""
 "Pravdepodobne nie je fatálna, ale mala aj napriek tomu by mala byť oznámená "
 "vývojárom."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "Sp_ráva o chybe"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Podrobnosti"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Chyba čítania súboru:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Chyba štruktúry súboru:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Nie je možné zapisovať do %s. Správca sedenia nebude fungovať."
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 #, fuzzy
 msgid "Extension not supported"
 msgstr "Dbus nie je podporovaný."
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Uložiť súbor ako..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Nie je možné nájsť databázu so záznamami o histórii"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 #, fuzzy
 msgid "Contacts"
 msgstr "_Obsah dokumentácie"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Dátum"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 #, fuzzy
 msgid "Nickname"
 msgstr "Prezývka:"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Správa"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 #, fuzzy
 msgid "Subject"
 msgstr "Predmet:"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 #, fuzzy
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Skutočne si želáte vyčistiť databázu?"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4195,20 +4583,16 @@ msgstr ""
 "\n"
 "V prípade, že zvolite Áno, prosíme o strpenie..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Export záznamov histórie..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s o %(time)s povedal(a): %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "kto"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
@@ -4218,113 +4602,158 @@ msgstr[1] ""
 "kontaktmi?"
 msgstr[2] ""
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Toto je nevratná operácia."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Skutočne si želáte zmazať vybranú správu?"
 msgstr[1] "Skutočne si želáte zmazať vybrané správy?"
 msgstr[2] ""
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "História konverzácie s %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je teraz %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je teraz %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Správy"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je teraz %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Kontakt sa prihlasil"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Kontakt sa odhlásil"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová jednoduchá správa"
 
-#: ../src/notify.py:150
+#: ../src/notify.py:234
 #, fuzzy, python-format
-msgid "New Private Message from room %s"
+msgid "New Private Message from group chat %s"
 msgstr "Nová privátna správa"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, fuzzy, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(who)s o %(time)s povedal(a): %(message)s\n"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, fuzzy, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nová správa ako %s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Nie je možné načítať obrázok"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Prijaté pozvanie"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "Bez pripojenie nemôžete publikovať informácie o vašom kontakte."
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "zverejnenia vCard zlyhalo"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Nastala chyba pri zverejňovaní vašich osobných údajov, skúste prosím neskôr."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Bez pripojenia, nemôžete získať informácie o kontakte."
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Spojiť účty"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Pozorovatelia"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Už ste v miestnosti %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Nemôžete sa pripojiť do miestnosti, pokiaľ ste neviditeľný(á)"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "pre %s účet"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "použiť %s účet"
@@ -4332,42 +4761,53 @@ msgstr "použiť %s účet"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "použiť %s účet"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "pre účet %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Spravovať záložky..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "pre účet %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 #, fuzzy
 msgid "History Manager"
 msgstr "Gajim - správca histórie"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Pripojiť do novej miestnosti"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Pripojiť sa ku skupinovému rozhovoru"
+
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Máte neprečítané správy"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1259
+msgid "You must read them before removing this transport."
+msgstr ""
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4375,67 +4815,86 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy k tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Transport \"%s\" bude odstránený"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Už nebudete môcť prijímať a odosielať správy k tomuto kontaktu cez tento "
+"transport."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Priradiť OpenPGP kľúč"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Nová miestnosť"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Chce si vás pridať do svojho zoznamu"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Preme_novať"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "_Prihlásiť"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "_Odhlásiť"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz  bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odstránená"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, 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:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -4444,7 +4903,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:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4452,36 +4911,51 @@ 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:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Odstránením tohoto kontaktu, automaticky odstránite aj autorizáciu, to "
+"znamená, že ona/on vás vždy uvidí ako offline."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Vložiť passfrázu ku GPG kľúču pre účet %s."
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Uložiť passfrázu"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Nesprávna passfráza"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zadajte znova vašu GPG passfrázu alebo stlačte Zrušiť."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 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:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4490,169 +4964,131 @@ msgstr ""
 "skupinových diskusií. Ste si skutočne istý(á), že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 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:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Máte neprečítané správy"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 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:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Vložiť %s do skupiny %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Zmeniť %s ako podkontakt pre %s"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Zmeniť Správu o stave..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Zmeniť správu o stave..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Ukryť toto menu"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d neprečítaná správa"
-msgstr[1] "Gajim - %d neprečítaných správ"
-msgstr[2] ""
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d neprečítaná správa"
-msgstr[1] "Gajim - %d neprečítaných správ"
-msgstr[2] ""
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d neprečítaná jednoduchá správa"
-msgstr[1] "Gajim - %d neprečítané jednoduché správy"
-msgstr[2] ""
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d neprečítaná správa zo skupinovej diskusie"
-msgstr[1] "Gajim - %d neprečítané správy zo skupinovej diskusie"
-msgstr[2] ""
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d neprečítaná súkromná správa"
-msgstr[1] "Gajim - %d neprečítané súkromné správy"
-msgstr[2] ""
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Rola:"
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Pripojenie:"
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Zdroj:"
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Stav:"
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Zápis:"
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Stav:"
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Posledná informácia o %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Od %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "od %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Prenesené:"
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Nezačal"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Zastavený"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Dokončený"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Uviaznutý"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Prenášanie"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Táto služba neodpovedala podrobnejšími informáciami"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4660,25 +5096,25 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Nie je možné načítať obrázok"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Pripojenie:"
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4686,7 +5122,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:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4694,14 +5130,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:336
+#: ../src/vcard.py:269
 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:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4709,27 +5145,15 @@ 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:347
+#: ../src/vcard.py:279
 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:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr "priorita zdroja"
 
-#: ../src/vcard.py:458
-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:491
-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:495
-msgid "Personal details"
-msgstr "Osobné detaily"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "vytváranie záznamov databáz"
 
@@ -4754,91 +5178,88 @@ msgstr "%s je adresár, ale mal by byť súbor"
 msgid "creating %s directory"
 msgstr "vytvorenie %s adresára"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "chýbajúca závislosť na pysqlite2 (aka python-pysqlite2). Ukončenie..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Služba nie je dostupná: Gajim nebeží alebo ovládanie vzdialeného Gajimu "
-"vrátilo False"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus nie je prítomný na tomto stroji alebo chýba modul pre Python"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Použiť DBus a Notification-Daemon pre zobrazenie upozornení"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minútach, po ktorých sa zmení stav na Preč."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Preč ako výsledok nečinnosti"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minútach, po ktorých sa zmení stav na Neprítomný(á)"
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Neprítomný(á) ako výsledok nečinnosti"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Použiť * / _ pár znakov ako možné formátovacie znaky."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ak je pravda, neodstaňuj */_ .  Takže *abc* bude tečné a * * nebude "
 "odstránené."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Pridať * a [n] do titulku zoznamu?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4846,11 +5267,11 @@ msgstr ""
 "Koľko riadkov si pamätať z predchádzajúceho rozhovoru, keď bude okno/záložka "
 "znovu otvorená."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Koľko minút má mať posledný riadok z poslednej konverzácie."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4858,11 +5279,11 @@ msgstr ""
 "Poslať správu pri stlačení Ctrl+Enter a pri Enter spraviť nový riadok "
 "(chovanie podobné ako Mirabilis ICQ klient)"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koľko riadkov posunúť pri stlačení Ctrl+šípka hore."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4871,22 +5292,22 @@ msgstr ""
 "Ani url s %s kde je %s slovo/fráza alebo 'WIKTIONARY' čo znamená použitie "
 "wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ak je zaškrtnuté, Gajim môže byť ovládaný na diaľku s použitím gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spýtať sa pred zatvorením okna/záložky pre skupinovú diskusiu."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4894,7 +5315,7 @@ msgstr ""
 "Spýtať sa vždy pred zatvorením okna/záložky pre skupinový rozhovor, ktorej "
 "meno je uvedené v zozname oddelenom medzerov."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4902,30 +5323,30 @@ msgstr ""
 "Nikdy sa nepýtať pred zatvorením okna/záložky pre skupinovú diskusiu, ktorej "
 "meno je špecifikované v zozname oddelenom medzerami"
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 msgstr "Potlačí server pre Prenos súborov, pri preklade/forwarde portu."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC štandard znamná KiB = 1024 bajtov, KB = 1000 bajtov."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Ukázať záložku len ak prebieha konverzácia?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Zobraziť okraj ak niekto konverzuje?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Zobraziť zatváracie tlačidlo v záložke?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4933,7 +5354,7 @@ msgstr ""
 "Bodkočiarkou oddelený zoznam slov bude zvýraznený rozhovore s viacerými "
 "používateľmi."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4941,11 +5362,11 @@ msgstr ""
 "Ak je pravda, Gajim skončí keď bude X tlačidlo vo Window manažéri stlačené. "
 "Toto nastavenie je použíté, len v prípade, že sa používa trayicon. "
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Ak je pravda, Gajim bude registrovaný pre xmpp:// pri každom spustení."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4953,15 +5374,16 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí ikonku na každej záložke obsahujúcej neprečítané "
 "správy. Závisí na téme, ikonka môže byť animovaná."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Ak je pravda, Gajim zobrazí stavovú správu, ak nie je prázdna, pre každý "
 "kontakt v zozname."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4969,7 +5391,7 @@ msgstr ""
 "Ak je pravda, Gajim si vyžiada avatara, pre každý kontakt, ktorý nemá "
 "avatara z posledného spojenia, alebo ak nie je cache príliš zastaralá."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4978,20 +5400,29 @@ msgstr ""
 "Ak nie je pravda, nebudete vidieť riadok o zmene stavu kontaktu a jeho/jej "
 "stavovú správu"
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -5001,17 +5432,19 @@ msgstr ""
 "2.8, potom bude okno blikať (bežné správanie pre väčšinu Window manažérov), "
 "keď sa udeje nejaká udalosť."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 nezdieľa informácie, keď sa používateľ pripojí do miestnosti "
 "chránenej heslom. Zmeňte túto možnosť na Vypnuté, aby sa neposielali "
 "informácie o prítomnosti v diskusnej skupine."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5019,7 +5452,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Nastavuje okno, kam sú umiestňované nové správy.\n"
 "'vždy' - Všetky správy sa zobrazia v jednom okne.\n"
@@ -5030,112 +5463,173 @@ msgstr ""
 "zobrazené v samostatnom okne. Poznámka: pre aplikovanie zmeny tohoto "
 "nastavenia, je nutné reštartovať Gajim"
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ak je Vypnuté, neuvidíte avatarov v diskusnom okne"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ak je  pravda, stlačením escape klávesy zatvoríte tab/okno"
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:207
 #, fuzzy
-msgid "Hides the buttons in group chat window"
+msgid "Hides the buttons in group chat window."
 msgstr "Spýtať sa pred zatvorením okna/záložky pre skupinovú diskusiu."
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
-msgstr ""
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
+msgstr "Spýtať sa pred zatvorením okna/záložky pre skupinovú diskusiu."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr "Spýtať sa pred zatvorením okna/záložky pre skupinovú diskusiu."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
+msgstr "Spýtať sa pred zatvorením okna/záložky pre skupinovú diskusiu."
+
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP nie je použiteľné na tomto počítači"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Jedlo"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Práve jem, prosím nechajte mi odkaz."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Pracujem"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefónujem"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Mám hovor."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Vonku"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Šiel som von užívať si život."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Prítomný"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Mám čas na debatu"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Služba nie je dostupná"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5143,7 +5637,7 @@ msgstr ""
 "Prehrať zvuk keď MUC správa obsahuje slová, ktoré sú v moc_highlihgt_words, "
 "alebo keď MUC správa obsahuje vašu prezývku."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5151,97 +5645,208 @@ msgstr ""
 "Prehrať zvuk keď príde akákoľvek MUC správa (Toto nastavenie sa vzťahuje len "
 "na účet, ak notify_on_all_muc_message je pravda)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "zelená"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "obchod s potravinami"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "človek"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "námornícka"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr "Nie je možné nahrať idle modul"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Nesprávna passfráza"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Redistračné informácie pre službu %s nedorazili včas"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Prezývka nenájdená: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Nie je možné vstúpiť do miestnosti"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Pre vstup do miestnosti je požadované heslo."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Vstup do miestnosti vám bol zakázaný."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Takáto miestnosť neexistuje."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "Vytváranie miestností je obmedzené."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Musíte použiť vašu zaregistrovanú prezývku."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Nie ste v zozname."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Požadovaná prezývka je používaná alebo už je registrovaná iným členom.\n"
+"Prosím zadajte inú prezývku:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Chcel by som si ťa pridať do môjho zoznamu."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "sme prihlásení k %s"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "požiadavka na odhlásenie od %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "sme odhlásení od %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s nevyhovuje RFC špecifikácii. Nebude pridaný do vášho zoznamu. Použite "
+"nástroje na správu zoznamu, napríklad: http://jru.jabberstudio.org/ pre jeho "
+"odstránenie"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Pre pokračovanie odosielania a prijímania správ, sa musíte znovu pripojiť."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Transport %s odpovedal nekorektne na registračnú požiadavky."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Nesprávna odpoveď"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Pripojený na server %s:%s s %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Skontrolujte svoje pripojenie alebo skúste neskôr"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikácia bola neúspešná s \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Prosím, skontrolujte správnosť prihlasovacieho mena a hesla."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passfráza nebola zadaná"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete pripojený(á) k %s bez OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "neviditeľný"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Som %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Táto správa je šifrovaná]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5250,299 +5855,563 @@ msgstr ""
 "Predmet: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Chcel by som si ťa pridať do môjho zoznamu."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
-msgid "Unable to load idle module"
-msgstr "Nie je možné nahrať idle modul"
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python väzby chýbajú na tomto počítači"
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Redistračné informácie pre službu %s nedorazili včas"
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus vlastnosti programu Gajim nemôžu byť použité"
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Nie je možné vstúpiť do miestnosti"
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "chýbajúca závislosť na pysqlite2 (aka python-pysqlite2). Ukončenie..."
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Pre vstup do miestnosti je požadované heslo."
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Služba nie je dostupná: Gajim nebeží alebo ovládanie vzdialeného Gajimu "
+"vrátilo False"
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Vstup do miestnosti vám bol zakázaný."
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus nie je prítomný na tomto stroji alebo chýba modul pre Python"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Takáto miestnosť neexistuje."
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "Vytváranie miestností je obmedzené."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Nič"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Musíte použiť vašu zaregistrovanú prezývku."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "kto"
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Nie ste v zozname."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Ulica:"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Port: "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "súbor"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
 msgstr ""
-"Požadovaná prezývka je používaná alebo už je registrovaná iným členom.\n"
-"Prosím zadajte inú prezývku:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "sme prihlásení k %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Udalosť"
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "požiadavka na odhlásenie od %s"
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "sme odhlásení od %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Pokračovať"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Zmazať"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgid "%0 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
 msgstr ""
-"JID %s nevyhovuje RFC špecifikácii. Nebude pridaný do vášho zoznamu. Použite "
-"nástroje na správu zoznamu, napríklad: http://jru.jabberstudio.org/ pre jeho "
-"odstránenie"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Registrovať na %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Pracujem"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Nič"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Udalosť"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Nepovolený znak v mene účtu."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Adresa serveru je požadovaná:"
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Nesprávny znak v mene servera."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Nepovolený znak v zdroji."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Neprítomný"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Mám čas na debatu"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Mám čas na debatu"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Prítomný"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Prítomný"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "Preč"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Preč"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "_Neviditeľný"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "?kontakt má stav:Chyba"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "?Zápis už máme:Nič"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Pre"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Oba"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "?Vyžiadať (zápis): Nič"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "?Skupinová diskusia - rola: Nič"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Skupinová diskusia - rola: Nič"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Vlastník"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrátor"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Člen"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "píše správu..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "prestal písať správu"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d neprečítaná správa"
+msgstr[1] "Gajim - %d neprečítaných správ"
+msgstr[2] ""
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d neprečítaná jednoduchá správa"
+msgstr[1] "Gajim - %d neprečítané jednoduché správy"
+msgstr[2] ""
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d neprečítaná správa zo skupinovej diskusie"
+msgstr[1] "Gajim - %d neprečítané správy zo skupinovej diskusie"
+msgstr[2] ""
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d neprečítaná súkromná správa"
+msgstr[1] "Gajim - %d neprečítané súkromné správy"
+msgstr[2] ""
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr ""
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "azúrová"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "vytváranie záznamov databáz"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "pre účet %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Nie je možné načítať obrázok"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Nie je možné pripojiť sa k \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Táto správa je šifrovaná]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Zapísať"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Adresa"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Preč"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Stiahnuť"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Pridať špeciálne na %s"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Neprítomný"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Zmazať"
+
+#~ msgid "Contact _Info"
+#~ msgstr "Kontaktné _info"
+
+#~ msgid "Contact Information"
+#~ msgstr "Kontaktné informácie"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Nesprávny názov miestnosti alebo serveru"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Neznáma verzia D-Bus: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "zverejnenie vCard úspešné"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Vaše osobné informácie boli úspešne zverejnené."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Presúvanie záznamov histórie..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Prosím počkajte, pokým prebieha migrácia záznamov z komunikácie..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Pripojiť do novej miestnosti"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Ukryť toto menu"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d neprečítaná správa"
+#~ msgstr[1] "Gajim - %d neprečítaných správ"
+#~ msgstr[2] ""
+
+#~ msgid "Since %s"
+#~ msgstr "Od %s"
+
 #~ msgid "Send"
 #~ msgstr "Poslať"
 
@@ -5806,17 +6675,10 @@ msgstr "azúrová"
 #~ msgid "(%s/s)"
 #~ msgstr "(%s/s)"
 
-#~ msgid "Service not available"
-#~ msgstr "Služba nie je dostupná"
-
 #~ msgid "Session bus is not available."
 #~ msgstr "Session bus nie je dostupný."
 
 #, fuzzy
-#~ msgid "with account %s"
-#~ msgstr "pre účet %s"
-
-#, fuzzy
 #~ msgid "with account "
 #~ msgstr "účet:"
 
diff --git a/po/sv.po b/po/sv.po
index 4af5d4fe2..7920c5699 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the gajim package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2005.
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-05-01 16:10+0200\n"
 "Last-Translator: Oscar Hellström <oscar@oscarh.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -20,15 +20,15 @@ msgstr ""
 "X-Poedit-Language: Swedish\n"
 "X-Poedit-Country: SWEDEN\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "En GTK+ jabberklient"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Gajim IM-klient"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM-klient"
 
@@ -45,16 +45,23 @@ msgid "_Discover Services..."
 msgstr "_Upptäck tjänster"
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "_Gruppchatt"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Redigera Konto..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Öppna e-postförfattning"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
 
@@ -108,7 +115,7 @@ msgid "Pass_word:"
 msgstr "Lösen_ord:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "Spara lösen_ord"
 
@@ -133,7 +140,7 @@ msgid "Your JID:"
 msgstr "Ditt JID:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "_Avancerat"
 
@@ -147,7 +154,7 @@ msgid "_Host:"
 msgstr "_Värd:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "_Lösenord:"
 
@@ -179,10 +186,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Information</b>"
 
@@ -199,6 +208,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Återanslut när anslutningen förloras"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Anslut vid start av Gajim"
 
@@ -219,6 +229,7 @@ msgstr ""
 "avslaget"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Välj nyc_kel..."
 
@@ -235,16 +246,16 @@ msgid "Edit Personal Information..."
 msgstr "Redigera personlig information..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "Generellt"
 
@@ -270,6 +281,7 @@ msgstr ""
 "anslutningen gör timeout vilket leder till frånkoppling"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -278,6 +290,7 @@ msgstr ""
 "rättigheter enbart för dig och din administratör"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -286,6 +299,7 @@ msgstr ""
 "det här kontot"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -302,18 +316,23 @@ msgstr "Information om dig, som den är sparad på servern"
 msgid "Manage..."
 msgstr "Hantera..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "Ingen nyckel vald"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "Ingen"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Personlig Information"
 
@@ -336,14 +355,18 @@ msgstr ""
 "Klienten med den högsta prioriteten får händelserna"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "Resur_s: "
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -357,40 +380,46 @@ msgstr ""
 "och \"Jobb\" samtidigt. Resursen med högst prioritet kommer få händelserna. "
 "(se undertill)"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Spara _lösenfras (osäkert)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Spara konversations_loggar för alla kontakter"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Skicka håll-vid-liv paket"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_ronisera kontostatus med global status"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Använd _SSL (föråldrat)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Använd anpassat värdnamn/port"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Använd proxy för filöverföringar"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "_Namn: "
 
@@ -400,62 +429,91 @@ msgstr "Konton"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "Om du har 2 eller fler konton och det här är ibockad kommer Gajim lista alla "
 "kontakter som om du hade ett konto"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "Sa_mmanfoga konton"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "_Modifiera"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "Ta _bort"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Konto:"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Tillåt henne/honom att se min status"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "Lägg till ny kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Jag vill lägga till dig i min kontaktlista."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Konto:"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Grupp:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 msgid "_Nickname:"
 msgstr "_Smeknamn:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protokoll:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Prenumerera"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Re_gistrera"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "Användar-ID:"
@@ -548,82 +606,63 @@ msgstr "<b>Ljud</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "Adress"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "A_vancerade åtgärder"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Avancerad konfigurationsredigerare"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Status: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "Borta"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Upptagen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Nerladdning"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "kommando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "Lägger Till Speciellt Meddelande För %s"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "Inte tillgänglig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Ledig för chatt"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "_Spela ljud"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -636,75 +675,75 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Gömmer knapparna i gruppchattfönstret"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Använd ett enkelt chattfönster med _flikar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Visa enbart i _registret"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Visa enbart i _registret"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Port: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -739,7 +778,7 @@ msgstr "Anslut till _gruppchatt"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_Lägg till registret"
 
@@ -760,7 +799,8 @@ msgid "_Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "_Starta chatt"
@@ -770,7 +810,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Klicka för att via tidigare konversationer med den här kontakten"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Skicka _Fil"
 
@@ -786,7 +827,8 @@ msgstr "_Kompakt vy Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historik"
 
@@ -851,7 +893,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "När en filöverföring är färdig, visa ett popupmeddelande"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Fortsätt"
 
@@ -888,39 +930,34 @@ msgstr ""
 "Banner"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Fetstil"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Skriver"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Teckensnitt-stil:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Gajim Temaanpassare"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Borta"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -928,7 +965,7 @@ msgstr ""
 "MUC\n"
 "Meddelande"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -936,19 +973,19 @@ msgstr ""
 "MUC-dirigerade\n"
 "Meddelanden"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "Pausad"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "Textfärg:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "Text-teckensnitt:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Bakgrund:"
 
@@ -1066,7 +1103,7 @@ msgid "Accept"
 msgstr "Acceptera"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "Neka"
 
@@ -1074,13 +1111,14 @@ msgstr "Neka"
 msgid "Invitation Received"
 msgstr "Inbjudan mottagen"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "Anslut till gruppchatt"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "Smeknamn:"
 
@@ -1098,13 +1136,8 @@ msgstr "Nyligen:"
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "_Anslut till"
 
@@ -1129,6 +1162,10 @@ msgstr "Hantera bokmärken"
 msgid "Print status:"
 msgstr "Skriv ut tid:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Server:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Titel:"
@@ -1150,7 +1187,8 @@ msgid "Manage Proxy Profiles"
 msgstr "Hantera proxyprofiler"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "Namn:"
 
@@ -1166,20 +1204,21 @@ msgstr "Använd autentisering"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klicka för att sätta in en känsloikoner (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP-kryptering"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "_Åtgärder"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "_Skicka"
 
@@ -1253,18 +1292,25 @@ msgid "Also known as iChat style"
 msgstr "Också känt som iChat-stil"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "Fråga efter statusmeddelande när jag:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Automatiskt bort_a efter:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Automatiskt ej tillgä_nglig efter:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1276,19 +1322,19 @@ msgstr ""
 "Använd alltid KDEs standardprogram\n"
 "Anpassa"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "För_e smeknamn:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "Chatt"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "Chattstatusmeddelanden:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1298,35 +1344,40 @@ msgstr ""
 "irriterar dig. Använd med förstånd, för det blockerar alla meddelanden från "
 "alla kontakter som inte finns i ditt register"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Statusmeddelande"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "Standarduppsättning av _statusikoner:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "Visa a_vatarer för kontakter i registret"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "Visa status_meddelanden för kontakter i registret"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "_Var 5:e minut"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "Känsloikoner:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "Händelser"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1336,14 +1387,14 @@ msgstr ""
 "som du har med en kontakt: Här kan du specificera vilka "
 "chattstatusmeddelanden du vill skicka till den andra parten."
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Gajim kommer automatiskt visa nya inkommande meddelanden genom att öppna "
 "relevant fönster"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1351,7 +1402,7 @@ msgstr ""
 "Gajim kommer att meddela dig om nya händelser via en popup i höger nederkant "
 "av skärmen"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1359,7 +1410,7 @@ msgstr ""
 "Gajim kommer säga till dig via ett popupfönster i det nedre högra hörnet av "
 "skärmen om kontakter som just loggat in"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1367,13 +1418,19 @@ msgstr ""
 "Gajim kommer säga till dig via ett popupfönster i det nedre högra hörnet av "
 "skärmen om kontakter som just loggat ut"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim kommer endast byta ikonen för kontakten som skickade den nya händelsen"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1381,7 +1438,7 @@ msgstr ""
 "Om ibockad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchatfönstret"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1389,7 +1446,7 @@ msgstr ""
 "Om ibockad kommer Gajim att visa statusmeddelanden för kontakter under "
 "kontaktens namn i register- och gruppchatfönstret"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1397,7 +1454,7 @@ msgstr ""
 "Om ibockad kommer Gajim komma ihåg registrets och chatfönstrets positioner "
 "och storlekar på skärmen nästa gång de används"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1407,7 +1464,7 @@ msgstr ""
 "kontakt för MSN kommer ha msn:s ikon för status online, borta, upptagen, "
 "osv...)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1415,11 +1472,11 @@ msgstr ""
 "Om inte avstängd kommer Gajim ersätta ascii smilies som ':)' med motsvarande "
 "grafiska känsloikoner"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "Ha_ntera..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1431,82 +1488,86 @@ msgstr ""
 "Per konto\n"
 "Per typ"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "Meddela när kontakter: "
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Meddela om ny _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "Vid varje _meddelande"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "Ett meddelandefönster:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "_Spela ljud"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "Skriv ut tid:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "Spara _position och storlek för register- och chattfönster"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "Visa enbart i _registret"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "Loggar _in"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "Loggar _ut"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "Det automatiska statusmeddelandet när du är borta"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "Det automatiska statusmeddelandet när du inte är tillgänglig"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr ""
 "Använd _transporternas\n"
 "ikonuppsättningar"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Använd aktivitetsfältet (aka. notifieringsyta)"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1518,151 +1579,160 @@ msgstr ""
 "händelser rörande nya meddelanden endast används om det är ett nytt "
 "meddelande från en kontakt du inte redan chattar med"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "När en ny händelse är mottagen"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Avancerad konfigurationsredigerare"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "Efter tid:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "Före tid:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "_Webbläsare:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "_Filhanterare:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "Teckensnitt:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorera händelser från kontakter som inte finns i registret"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "_Inkommande meddelande:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "_Logga statusändringar hos kontakter"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "_E-postklient:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "_Aldrig"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "_Meddela mig"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "Öppna..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "Utgående meddelande:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "_Spelare:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "_Öppna det"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "Återställ till Standardfärger"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "_Sortera kontakter efter status"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "_Statusmeddelande:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "minuter"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Privat Chatt"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Format av en rad</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "Anslut vid start av Gajim"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Radera"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber-ID:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "Ban-lista"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Prenumeration"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "I gruppen"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1670,32 +1740,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "Skicka meddelande"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "Be om att få se hans/hennes status"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "Tillåt henne/honom att se min status"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Om"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adress"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "Ställ in _Avatar"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Födelsedag:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Ort:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "Företag:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "Land:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "Avdelning:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-post:"
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "Extra adress:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "Efternamn:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: ÅÅÅÅ-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "Förnamn:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "Hemsida:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "Mellannamn:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "Mer"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "Personlig Information"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "Telefonnr.:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "Position:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "Postnummer:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "Prefix:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "Roll:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "Delstat:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "Gatuadress:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "Suffix:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "Jobb"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Publicera"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Hämta"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1715,47 +1925,58 @@ msgid "A_sk to see his/her status"
 msgstr "Be om att få se hans/hennes status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "Lägg till Visuella Meddelanden"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Tilldela Open_PGP-nyckel"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "Redigera _grupper"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Skicka enstaka _meddelande"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Starta _Chatt"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Tillåt henne/honom att se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Förbjud henne/honom att se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "Ta bo_rt från register"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "Byt _namn"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_Prenumeration"
 
@@ -1780,42 +2001,53 @@ msgid "Help online"
 msgstr "Hjälp online"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "Profil, avatar"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "Transporter"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Visa _Frånkopplade Kontakter"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Upptäck tjänster"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Inställningar"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Avsluta"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Röst"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "Kör"
@@ -1885,23 +2117,19 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "Auktorisera kontakt så han kan veta när du är ansluten"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "Kontakt_info"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Avvisa auktorisering från kontakt så att han inte kan veta när du är ansluten"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "Prenumerationsförfrågan"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "_Auktorisera"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Neka"
 
@@ -1917,164 +2145,51 @@ msgstr "Visa _Registret"
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Om"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adress"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Fråga:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Födelsedag:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Ort:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Företag:"
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Kontaktinformation"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Land:"
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Avdelning:"
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "E-post:"
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "Extra adress:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Efternamn:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: ÅÅÅÅ-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Förnamn:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Hemsida:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakter"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Plats"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Mellannamn:"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Mer"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Telefonnr.:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Position:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Postnummer:"
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "Prefix:"
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Resurs:"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Roll:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Ställ in _Avatar"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Delstat:"
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "Gatuadress:"
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "Prenumeration:"
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "Suffix:"
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "Jobb"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Logga konversationshistorik"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Publicera"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Hämta"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabbertrafik</b>"
@@ -2106,30 +2221,165 @@ msgstr "_Meddelande"
 msgid "_Presence"
 msgstr "_Närvaro"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "Namn:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Namn:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Personliga detaljer"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "_Redigera Konto..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Använd anpassat värdnamn/port"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Inställningens namn"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Värde"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Ingen)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Dold"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "Generellt"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "grön"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "Plats"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Kursiv"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "_Publicera"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2145,53 +2395,63 @@ msgstr ""
 "\n"
 "Funktionen \"markera felstavade ord\" kommer inte att användas"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "En förbindelse är inte tillgänglig"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Ditt meddelande kan inte skickas förren du är ansluten."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "Chatts"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s: %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s har inte meddelat en OpenPGP-nyckel, du har inte heller tilldelat en"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "Kryptering aktiverad"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "Kryptering deaktiverad"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "Inte i registret"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du mottog just ett meddelande från \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2199,226 +2459,272 @@ msgstr ""
 "Om du stänger den här fliken och du har historik avslaget kommer meddelandet "
 "att förloras."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "Avstängd"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Var %s _minut"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "En förbindelse är inte tillgänglig"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "Första meddelandet har mottagits"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "Nytt Meddelande Har Mottagits"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "Kontakt Ansluten"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "Kontakt Loggade Ut"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "Meddelande Skickat"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "Markering av Meddelande i Gruppchatt"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "Meddelande Mottaget i Gruppchatt"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP är inte användbart på den här datorn"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "För att ändra kontonamnet måste du vara frånkopplad"
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "Olästa händelser"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr "För att ändra kontonamnet måste du först läsa alla väntande händelser."
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Detta namn används redan av ett av dina konton. Vänligen välj ett annat namn."
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ett Jabber-ID måste vara av formen \"användare@server\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "Strax tillbaka"
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "Logga in igen nu?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Om du vill att ändringarna skall ske omedelbart måste du logga in igen."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Du måste skapa ditt konto innan du redigerar din personliga information."
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan inte redigera din personliga information utan en förbindelse."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr ""
+"Du måste skapa ditt konto innan du redigerar din personliga information."
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det uppstod problem när dina hemliga OpenPGP-nycklar skulle hämtas."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "Val av OpenPGP-nyckel"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "Läs alla vändande händelser innan du tar bort detta konto."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Du har inget aktivt konto"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Kontonamnet används redan"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "Ban-lista"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "Medlemslista"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "Ägarelista"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "Administratörlista"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "Anledning"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "Bannlyser..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2426,11 +2732,11 @@ msgstr ""
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2438,21 +2744,21 @@ msgstr ""
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Vem vill du göra till ägare?</b>\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "Lägger till Administratör..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2460,7 +2766,7 @@ msgstr ""
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2476,87 +2782,88 @@ msgstr ""
 "4. domän (domänen i sig matchar, så gör även alla användare@domän,\n"
 "domän/resurs, eller adress som innehåller en underdomän."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "Lösenord Krävs"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv in lösenordet för konto %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nytt rum"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Gruppchatt"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Fyll i server- och rumfälten eller ta bort det här bokmärket."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "Du behöver ange ett användarnamn för att konfigurera detta konto."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "Du måste skriva in ett lösenord för det nya kontot."
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "Dubblett av Jabber-ID"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "Detta kontot är redan konfigurerat i Gajim."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "Kontot har blivit tillagt"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2564,23 +2871,23 @@ msgstr ""
 "Du kan ställa in avancerade alternativ genom att trycka på \"Avancerat\", "
 "eller senare genom att använda \"Redigera->Konton\" från huvudfönstret."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "Ditt nya konto har skapats"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "Ett fel uppstod när kontot skulle skapas"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2588,464 +2895,515 @@ msgstr ""
 "Texten under denna linje är vad som har sagts sedan du senast hade fokus på "
 "denna gruppchatt"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Åtgärder för \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _Uppslagsbok"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL för uppslagsbok saknar ett \"%s\" och det är inte en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsökning saknar ett \"%s\""
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "Igår"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagar sen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python-bindningar saknas på den här datorn"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Gajims D-Bus-egenskaper kan inte användas"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens namn: <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "Grupp"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "Nyckel-ID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "Kontaktnamn"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr "Statusmeddelande för %s"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "Spara som Valbart Statusmeddelande"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "Skriv ett namn för detta statusmeddelande"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Adress:"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Adress:"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Extra adress:"
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Fyll i informationen om kontakten du vill lägga till i konto %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Fyll i informationen om kontakten du vill lägga till"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "Användarens ID får inte innehålla en resurs."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "Kontakten finns redan i registret"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "Den här kontakten finns redan i ditt register."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "Användar-ID:"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabberklient"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "TACK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Sist men inte minst vill vi tacka alla anvsraiga paketerare."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr ""
 "Christian Bjälevik <nafallo@magicalforest.se>\n"
 "Oscar Hellström <oscar@oscarh.net>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Lyckades inte gå med i rummet"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Prenumerationsförfrågan för konto %s från %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "Du är redan i rummet %s"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt med konto %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Ogiltigt rum- eller servernamn"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "Fyll i kontakt-ID för kontakten du vill\n"
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "Förbindelse inte tillgänglig"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Lyckades inte skriva fil i %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "Utan en förbindelse kan du inte ändra ditt lösenord."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "Kontakt Loggade In"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "Nytt Enstaka Meddelande"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Kontakt Loggade Ut"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
+msgstr "Enstaka Meddelande med konto %s"
+
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
 msgstr "Enstaka Meddelande med konto %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "Mottog %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konsol för %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr "XML-konsol"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Beskrivning: %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Format av en rad</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Format av en rad</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Privat Chatt"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s har bjudit in dig till %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "Välj Bild"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "När %s blir:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Lägger Till Speciellt Meddelande För %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "Förbindelse"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "Andra"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "Konferens"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "Utan en förbindelse kan du inte bläddra bland tillgängliga tjänster"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Söker tjänster med konto %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "Tjänstefinnare"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3053,46 +3411,51 @@ msgstr ""
 "Adressen du angav är ingen tjänstadress eller så svarar inte tjänsten. "
 "Kontrollera adressen och försök igen."
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Tjänst är inte bläddringsbar"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Denna typ av tjänst innehåller inga objekt att bläddra genom."
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Bläddrar %s med konto %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Denna tjänst innehåller inga objekt att bläddra genom."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Undersöker %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "Användare"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "Beskrivning"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Fil"
@@ -3110,7 +3473,7 @@ msgstr "Förlopp"
 msgid "Filename: %s"
 msgstr "Filnamn: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Storlek: %s"
@@ -3118,17 +3481,17 @@ msgstr "Storlek: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "Mottagare: "
 
@@ -3149,78 +3512,88 @@ msgstr "Filöverföring avbruten"
 msgid "Connection with peer cannot be established."
 msgstr "Förbindelse med motpart kan inte etableras."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Mottagare: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Skriv ditt meddelande:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Filöverföring stoppad av motparten"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Välj fil att skicka..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim kan inte komma åt denna fil"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Denna fil används av en annan process."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vill skicka en fil till dig:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "Vad vill du göra?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Spara fil som..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3228,58 +3601,257 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Ogiltig Fil"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "Sändare: "
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "Paus"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim behöver Xserver för att fungera. Avbryter..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim behöver PyGTK 2.6 eller senare"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim behöver PyGTK 2.6 eller senare för att fungera. Avbryter..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim behöver GTK 2.6 eller senare"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim behöver GTK 2.6 eller senare för att fungera. Avbryter..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ runtime saknar libgladestöd"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Vänligen ta bort din nuvarande GTK+ runtime och installera senaste stabila "
+"version från %s"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Vänligen kontrollera att GTK+ och PyGTK har libgladestöd i ditt system."
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim behöver PySQLite2 för att fungera"
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim behöver PySQLite2 för att fungera"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Auktorisering för %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "Accepterar du den här förfrågan?"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Förbindelse"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Ämne: %s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "problem vid sändning %s ( %s )"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "Auktorisering accepterad"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakten \"%s\" har auktoriserat dig att se hans eller hennes status."
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "Du kommer alltid se honom eller henne som frånkopplad."
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt med \"%s\" kan inte etableras"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "Kontrollera din förbindelse eller försök igen senare."
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s är nu %s (%s)"
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "Din lösenfras är inkorrekt."
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Ny Epost på %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Du har %d oläst E-postmeddelanden"
+msgstr[1] "Du har %d olästa E-postmeddelanden"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s vill skicka en fil till dig."
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "%(filename)s har mattagits från %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Överföringen av %(filename)s från %(name)s har stannat."
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "%(filename)s har skickats till %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Överföringen av %(filename)s till %(name)s har stannat."
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Vänligen fyll i informationen för ditt nya konto</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "Kunde inte spara dina inställningar"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "Session Management-stöd inte tillgängligt (saknar gnome.ui-modul)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "visar hjälp för ett specifikt kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "visar hjälp för kommando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Visar eller gömmer registerfönstret"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "Öppnar ett fönster med nästa olästa meddelande"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3287,46 +3859,46 @@ msgstr ""
 "Skriv ut en lista på alla kontakter i registret. Varje kontakt hamnar på en "
 "egen rad"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "visa bara kontakter för det givna kontot"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Skriver ut en lista över registrerade konton"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Ändrar status för konto eller konton"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "meddelande"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "statusmeddelande"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -3334,20 +3906,20 @@ msgstr ""
 "ändra status för konto \"konto\". Om inte specificerad, försök ändra status "
 "på alla konton som har \"synka med global status\" satt"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Visa chattdialogen så att du kan skicka meddelanden till en kontakt"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID för kontakten som du vill chatta med"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "om specificerat tas kontakten bort från kontaktlistan för det här kontot"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3358,28 +3930,28 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID för kontakten som kommer ta emot meddelandet"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "meddelandeinnehåll"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "pgp-nyckel"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "om specificerat kommer meddelandet bli krypterat med den här publika nyckeln"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "om specificerat kommer meddelandet bli skickat genom det här kontot"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3390,129 +3962,144 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "Ämne"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "Meddelande Skickat"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Hämta detaljerad information om kontakt"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID för kontakten"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Hämtar detaljerad information för kontakt"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Namn för kontot"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Skicka fil till en kontakt"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Sökväg"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "om specificerat kommer filen bli skickad genom det här kontot"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Listar alla inställningar och deras värden"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sätter värdet av \"nyckel\" till \"värde\"."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "\"nyckel\" är namnet på inställningen, \"värde\" är värdet att sätta den till"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Tar bort en inställning"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "nyckel"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "namnet på inställningen som skall tas bort"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver Gajims nuvarande inställningar till .config-filen"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Ta bort en kontakt från register"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Lägger till en kontakt till registret"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Lägger till ny kontakt till detta kontot."
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande status (global status om inget konto specificerats)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande statusmeddelande (det globala om inget konto "
 "specificerats)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Returnerar antalet olästa meddelanden"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr "XML-konsol"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "Saknar argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3521,16 +4108,11 @@ msgstr ""
 "\"%s\" finns inte i ditt register.\n"
 "Specificera konto för att skicka meddelandet."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "Du har inget aktivt konto"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Okänd D-Busversion: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3539,16 +4121,16 @@ msgstr ""
 "Användning: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Parametrar:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s kunde inte hittas"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3557,7 +4139,7 @@ msgstr ""
 "Användning: %s kommando [parametrar]\n"
 "Kommando är en av:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3566,329 +4148,135 @@ msgstr ""
 "Parameter \"%s\" är inte specificerad. \n"
 "Skriv \"%s help %s\" för mer info"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim behöver Xserver för att fungera. Avbryter..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim behöver PyGTK 2.6 eller senare"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim behöver PyGTK 2.6 eller senare för att fungera. Avbryter..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim behöver GTK 2.6 eller senare"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim behöver GTK 2.6 eller senare för att fungera. Avbryter..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ runtime saknar libgladestöd"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Vänligen ta bort din nuvarande GTK+ runtime och installera senaste stabila "
-"version från %s"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Vänligen kontrollera att GTK+ och PyGTK har libgladestöd i ditt system."
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim behöver PySQLite2 för att fungera"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Auktorisering för %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Accepterar du den här förfrågan?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "problem vid sändning %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Auktorisering accepterad"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakten \"%s\" har auktoriserat dig att se hans eller hennes status."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Du kommer alltid se honom eller henne som frånkopplad."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt med \"%s\" kan inte etableras"
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Kontrollera din förbindelse eller försök igen senare."
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s är nu %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Din lösenfras är inkorrekt."
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Ny Epost på %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "Du har %d oläst E-postmeddelanden"
-msgstr[1] "Du har %d olästa E-postmeddelanden"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s vill skicka en fil till dig."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "%(filename)s har mattagits från %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Överföringen av %(filename)s från %(name)s har stannat."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "%(filename)s har skickats till %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Överföringen av %(filename)s till %(name)s har stannat."
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "publicering av vCard lyckades"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Din personliga information har blivit publicerad"
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "publicering av vCard misslyckades"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Det uppstod ett fel vid publiceringen av er personliga information, var "
-"vänlig försök igen senare."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "Kunde inte spara dina inställningar"
-
-#: ../src/gajim.py:1903
-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:1932
-msgid "Migrating Logs..."
-msgstr "Migrerar Logfiler"
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Vänligen vänta medan logfiler blir migrerade..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "temanamn"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Du kan inte ta bort ditt nuvarande tema"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Vänligen välj ett annat tema först."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Privat Chatt"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Privat Chatt"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Du är inte längre i rummet \"%s\" eller \"%s\" har lämnat."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Gruppchatt"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Gruppchatt"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Byt smek_namn"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Det här rummet har inget ämne"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s är nu %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Smeknamnet kunde inte hittas: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "Det här rummet har inget ämne"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s verkar inte vara ett giltigt JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Inget sådant kommondo: /%s (om du vill skicka detta, använd /say som prefix)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandon: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3901,7 +4289,7 @@ msgstr ""
 "befinner sig i rummet kommer han/hon/den/det också att att bli sparkad. "
 "Stödjer INTE mellanslag i smeknamn."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3909,12 +4297,12 @@ msgstr ""
 "Användning: /%s <semknamn>, öppnar ett privat chattfönster till den "
 "specificerade deltagaren."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Användning: /%s, tömmer fönstret från text."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3923,12 +4311,12 @@ msgstr ""
 "Användning: /%s [anledning], stänger aktuellt fönster eller flik och visar "
 "anledning om sådan specificerades."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Användning: /%s, gömmer knapparna."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3937,7 +4325,7 @@ msgstr ""
 "Användning: /%s <JID> [anledning], bjuder in JID till aktivt rum med en "
 "valbar anledning."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -3946,7 +4334,7 @@ msgstr ""
 "Användning: /%s <rum>@<server>[/smeknamn], erbjuder att delta i rum@server "
 "med valbart smeknamn"
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3956,7 +4344,7 @@ msgstr ""
 "Användning: /%s <smeknamn> [anledning], tar bort medlemmen specificerad med "
 "smeknamn och visar en valbar anledning. Stödjer INTE mellanslag i smeknamnet."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -3965,7 +4353,7 @@ msgstr ""
 "Användning: /%s <handling>, skickar handling till aktivt rum. Använd tredje "
 "person. (t.ex. /%s exploderar.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -3974,22 +4362,22 @@ msgstr ""
 "Användning: /%s <smeknamn> [meddelande], öppnar ett privat meddelandefönster "
 "och skickar ett meddelande till medlemmen specificerad med smeknamn."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Användning /%s <smeknamn>, byter ditt smeknamn i aktivt rum."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "Användning /%s [ämne], visar eller uppdaterar nuvarande ämne."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Användning /%s [ämne], visar eller uppdaterar nuvarande ämne."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -3997,79 +4385,79 @@ msgstr ""
 "Användning: /%s <meddelande>, skickar meddelande utan att leta efter andra "
 "kommandon."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjälp för /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Är du säker på att du vill lämna rum \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr ""
 "Om du stänger det här fönstret kommer du bli frånkopplad från det här rummet."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "Fråga mig i_nte igen"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "Ange det nya smeknamnet du vill använda:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "Bokmärke finns redan"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Rummet \"%s\" finns redan i dina bokmärken."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "Bokmärke har blivit ordentligt tillagt"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i ditt register."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Ett programmeringsfel har upptäckts"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4077,88 +4465,88 @@ msgstr ""
 "Det är antagligen inte förödande, men det bör rapporteras till utvecklarna "
 "likafullt."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Rapportera Bug"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fel: kan inte öppna %s för läsning"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "Fel vid läsning av fil:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "Fel vid parsning av fil:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Kunde inte skriva till %s. Session Management-stöd kommer inte att fungera"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Spara fil som..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "Kan inte hitta historie- och logdatabas"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "Smeknamn"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Meddelande"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "Ämne"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Vill du städa upp databasen? (DU AVRÅDS ATT GÖRA DETTA OM GAJIM KÖRS)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4172,131 +4560,173 @@ msgstr ""
 "\n"
 "Om du väljer JA, vänligen vänta..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "Exporterar Loggar..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "vem"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Vill du verkligen ta bort loggar för den valda kontakten?"
 msgstr[1] "Vill du verkligen ta bort loggar för de valda kontakterna?"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "Denna operation kan inte göras ogjord."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vill du verkligen ta bort det valda meddelandet?"
 msgstr[1] "Vill du verkligen ta bort det valda meddelandena?"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversationshistorik med %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s är nu %(status)s:%(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s är nu %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status är nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s är nu %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Loggade In"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Loggade Ut"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nytt Enstaka Meddelande %(nickname)s"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "Nytt Privat Meddelande från rum %s"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "Kunde inte ladda bild"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "Inbjudan mottagen"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "Utan en förbindelse kan du inte publicera din kontaktinformation."
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "publicering av vCard misslyckades"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Det uppstod ett fel vid publiceringen av er personliga information, var "
+"vänlig försök igen senare."
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "Utan en förbindelse kan du inte hämta din kontaktinformation."
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observerande"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Du är redan i rummet %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan inte ansluta till ett rum när du är osynlig"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "till %s konto"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "använder %s konto"
@@ -4304,41 +4734,53 @@ msgstr "använder %s konto"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "använder konto %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "för konto %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Hantera bokmärken..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "för konto %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "Hantera Historik"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "Anslut till nytt _rum"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "_Anslut till gruppchatt"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "Du har olästa meddelanden"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Läs alla vändande händelser innan du tar bort detta konto."
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4346,69 +4788,88 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "från denna transport."
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Transporten \"%s\" kommer tas bort"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
+"från denna transport."
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "Nytt rum"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "Jag skulle vilja lägga till dig i mitt register"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "Döp om"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "Ans_lut"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "K_oppla från"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "Byt _Statusmeddelande"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, 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:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4416,7 +4877,7 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen "
 "vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4424,38 +4885,53 @@ 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:1831
+#: ../src/roster_window.py:2334
 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:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen "
+"vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, 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:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "Spara lösenfras"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "Fel Lösenfras"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vänligen skriv om ditt GPG-lösenord eller tryck Avbryt."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4463,19 +4939,20 @@ 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:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 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:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Du har olästa meddelanden"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4483,145 +4960,111 @@ msgstr ""
 "Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
 "historik påslagen."
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Placera %s i grupp %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gör %s till en metakontakt för %s"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "Byt Statusmeddelande..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "_Byt Statusmeddelande..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "Gömmer denna meny"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - ett oläst meddelande"
-msgstr[1] "Gajim - %d olästa meddelanden"
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - ett oläst meddelande"
-msgstr[1] "Gajim - %d olästa meddelanden"
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - ett oläst enstaka meddelande"
-msgstr[1] "Gajim - %d olästa enstaka meddelanden"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - ett oläst gruppchatmeddelande"
-msgstr[1] "Gajim - %d olästa gruppchatmeddelanden"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - ett oläst privat meddelande"
-msgstr[1] "Gajim - %d olästa privata meddelanden"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "Roll: "
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "Anknytning: "
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "Status: "
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "Prenumeration: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr "Senaste status på %s"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Från %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "från %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber-ID:"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "Nerladdning"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "Uppladdning"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "Överfört: "
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "Inte startad"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "Färdig"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "Avstannad"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "Överför"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "Denna tjänst har ännu inte svarat med detaljerad information"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4629,25 +5072,25 @@ msgstr ""
 "Denna tjänst kunde inte svara med detaljerad information.\n"
 "Tjänsten är antagligen föråldrad eller trasig."
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Kunde inte ladda bild"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "från %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Anknytning: "
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4655,7 +5098,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4663,39 +5106,27 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 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:338
+#: ../src/vcard.py:271
 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:347
+#: ../src/vcard.py:279
 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:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
-#: ../src/vcard.py:458
-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:491
-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:495
-msgid "Personal details"
-msgstr "Personliga detaljer"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "skapar logdatabas"
 
@@ -4720,91 +5151,87 @@ msgstr "%s är en katalog, men borde vara en fil"
 msgid "creating %s directory"
 msgstr "skapar katalogen %s"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2- (aka python-pysqlite2) beroende saknas. Stänger av..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Tjänsten ej tillgänglig: Gajim körs inte, eller så är remote_control False"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus finns inte på den här maskinen eller så saknas pythonmodulen"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Sessionsbussen är inte tillgänglig.\n"
-"Läs http://trac.gajim.org/wiki/GajimDBus för hjälp"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Använd DBus och Notification-Daemon för att visa meddelanden"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minuter tills din status ändras till borta."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "Borta på grund av inaktivitet"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minuter tills din status ändras till inte tillgänglig."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "Inte tillgänglig på grund av inaktivitet"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandla par av * / _ som möliga formateringstecken."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Om True tas inte */_ bort. *abc* blir fetstil men * * / / _ _ inte borttagna."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "Lägg till * och [n] i registerfönstrets titel."
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4812,12 +5239,12 @@ msgstr ""
 "Hur många rader som skall kommas ihåg från tidigare konversation när en "
 "chatt-flik/fönster öppnas igen."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Mur många minuter skall de sista raderna från tidigare konversation sparas."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4825,11 +5252,11 @@ msgstr ""
 "Skicka meddelande med Ctrl+Enter och gör radbryt med Enter (Mirabilis ICQ "
 "Klientens standardbeteende)."
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hur många rader skall sparas för Ctrl+KeyUP."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4838,21 +5265,21 @@ msgstr ""
 "Skriv in url med %s i där %s är ordet/frasen eller 'WIKTIONARY' vilket "
 "betyder att wiktionary skall användas."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Om ibockad kan Gajim bli fjärrstyrd med gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fråga innan gruppchattflik eller -fönster stängs."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4860,7 +5287,7 @@ msgstr ""
 "Fråga alltid innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
@@ -4868,7 +5295,7 @@ msgstr ""
 "Fråga aldrig innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4876,30 +5303,30 @@ msgstr ""
 "Åtsidosätter vilket värdnamn vi skickar vid filöverföring, t.ex. vid NAT och "
 "port forwarding."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standarden säger att KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "Visa flik när endast en konversation är aktiv?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Visa flikkant om endast en konversation är aktiv?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "Visa stängknapp i flik?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr "En semikolonseparerad lista av ord som blir upplysta i gruppchatt."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4907,11 +5334,11 @@ msgstr ""
 "Om True avslutar Gajim när fönsterhanterarens X-knapp trycks på. Denna "
 "inställning behandlas bara när aktivitetsfältet används."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Om True registreras Gajim för xmpp:// vid varje uppstart."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4919,15 +5346,16 @@ msgstr ""
 "Om True kommer Gajim att visa en ikon på varje flik som innehåller olästa "
 "meddelanden. Beroende på tema kan denna ikon vara animerad."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "Om True kommer Gajim att visa statusmeddelande, om inte tomt, för varje "
 "kontakt under dess namn i registerfönstret"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4935,7 +5363,7 @@ msgstr ""
 "Om True kommer Gajim att fråga alla kontakter som antingen inte hade en "
 "avatar, eller som har en för gammal cachad avatar om deras nuvarande avatar."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4944,20 +5372,29 @@ msgstr ""
 "Om False kommer du inte längre att se en statusrad i chattfönstret när en "
 "kontakt byter hans eller hennes status och/eller statusmeddelande."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4967,17 +5404,19 @@ msgstr ""
 "blinka (standardbeteende i de flesta fönsterhanterare) när det finns "
 "väntande händelser."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "Jabberd1.4 tycker inte om SHA-info när man ansluter till ett "
 "lösenordsskyddat rum. Sätt denna inställning till False för att inte skicka "
 "SHA-info i gruppchattnärvaroinformation"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4985,7 +5424,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "Kontrollerar fönstret där nya meddelanden placeras.\n"
 "'always' - Alla meddelanden öppnas i ett gemensamt fönster.\n"
@@ -4995,52 +5434,67 @@ msgstr ""
 "visas i ett specifikt fönster. OBS: Gajim måste startas om för att denna "
 "inställning skall börja gälla."
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Of False kommer du inte längre att se avatarer i chattfönstret"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Om True kommer escape att stänga en tabb eller ett fönster"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Gömmer knapparna i gruppchattfönstret"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Gömmer knapparna i tvåpersoners chattfönster"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "Gömmer bannern i gruppchatfönstret"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "Gömmer bannern i tvåpersoners chattfönster"
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "Gömmer deltagarelistan i gruppchatfönstret"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5048,59 +5502,106 @@ msgstr ""
 "If ibockad kommer Gajim kommer gajim att använda ditt IP och proxies "
 "definerade i file_transfer_proxies under inställningar för filöverföringar."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP är inte användbart på den här datorn"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "Äter"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "Jag äter, så lämna ett meddelande."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "Arbetar"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Jag är ute och njuter av livet."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "Tillgänglig"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Ledig för chatt"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "Tjänst är inte tillgänglig"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5108,7 +5609,7 @@ msgstr ""
 "Ljud att spela när MUC-meddelande innehåller ett av orden i "
 "muc_highlight_words, eller när MUC-meddelande innehåller ditt smeknamn."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5116,96 +5617,208 @@ msgstr ""
 "Ljud att spela när MUC-meddelande anländer. (Denna inställning behandlas "
 "endast om notify_on_all_muc_messages är satt till True)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "grön"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "grönsaker"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "mänsklig"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "marin"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr "Lyckades inte ladda tomgångsmodul"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "Fel Lösenfras"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Registreringsinformation för transport %s har inte kommit fram i tid"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Smeknamnet kunde inte hittas: %s"
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "Lyckades inte gå med i rummet"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "Det krävs en lösenfras för att ansluta till detta rum."
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "Du är bannlyst från detta rummet."
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "Det finns inget sådant rum."
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "Möjligheten att skapa rum är begränsad."
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "Ditt registrerade smeknamn måste användas."
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "Du är inte med i medlemslistan."
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Ditt önskade smeknamn används redan eller är registrerat av en annan "
+"deltagare.\n"
+"Vänligen ange ett annat smeknamn nedan:"
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "Jag skulle vilja lägga till dig i mitt register."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "vi prenumererar nu på %s"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "avprenumerationsförfrågan från %s"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "vi prenumererar inte längre på %s"
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s följer inte RFC. Dt kommer inte att läggas till till ditt register. "
+"Använd registerhanteringsverktyg så som http://jru.jabberstudio.org/  för "
+"att ta bort det"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "För att fortsätta skicka och ta emot meddelanden måste du återansluta."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "Transporten %s svarade felaktigt på en registreringsbegäran."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Ansluten till server %s:%s med %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "Kontrollera din förbindelse eller försök igen"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggning misslyckades med \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "Kontrollera ditt inloggningsnamn och lösenord."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "Lösenordsfras för OpenPGP angavs inte"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du kommer ansluta till %s utan OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "osynlig"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "frånkopplad"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "Jag är %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Det här meddelandet är krypterat]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5214,300 +5827,559 @@ msgstr ""
 "Ämne: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Jag skulle vilja lägga till dig i mitt register."
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
-msgid "Unable to load idle module"
-msgstr "Lyckades inte ladda tomgångsmodul"
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python-bindningar saknas på den här datorn"
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registreringsinformation för transport %s har inte kommit fram i tid"
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Gajims D-Bus-egenskaper kan inte användas"
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "Lyckades inte gå med i rummet"
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2- (aka python-pysqlite2) beroende saknas. Stänger av..."
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Det krävs en lösenfras för att ansluta till detta rum."
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Tjänsten ej tillgänglig: Gajim körs inte, eller så är remote_control False"
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Du är bannlyst från detta rummet."
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus finns inte på den här maskinen eller så saknas pythonmodulen"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Det finns inget sådant rum."
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Sessionsbussen är inte tillgänglig.\n"
+"Läs http://trac.gajim.org/wiki/GajimDBus för hjälp"
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "Möjligheten att skapa rum är begränsad."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Ingen"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Ditt registrerade smeknamn måste användas."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "vem"
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Du är inte med i medlemslistan."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Gatuadress:"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Port: "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "fil"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
 msgstr ""
-"Ditt önskade smeknamn används redan eller är registrerat av en annan "
-"deltagare.\n"
-"Vänligen ange ett annat smeknamn nedan:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi prenumererar nu på %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Händelse"
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "avprenumerationsförfrågan från %s"
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi prenumererar inte längre på %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Fortsätt"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Radera"
 
-#: ../src/common/connection_handlers.py:1680
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgid "%0 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
 msgstr ""
-"JID %s följer inte RFC. Dt kommer inte att läggas till till ditt register. "
-"Använd registerhanteringsverktyg så som http://jru.jabberstudio.org/  för "
-"att ta bort det"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "Registrera till %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "Arbetar"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Ingen"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Händelse"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "Ogiltigt tecken i användarnamn"
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "Serveradress krävs."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "Ogiltigt tecken i värdnamn."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "Ogiltigt tecken i resurs."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "_Upptagen"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "_Inte tillgänglig"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Inte tillgänglig"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "_Ledig för chatt"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "Ledig för chatt"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "_Tillgänglig"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "Upprättar förbindelse"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "_Borta"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Borta"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "_Frånkopplad"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "_Osynlig"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "?kontakt har status:Okänd"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "?kontakt har status:Har fel"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "?Prenumeration vi redan har:Ingen"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "Till"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "Från"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "Båda"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "?Fråga (för prenumeration):Ingen"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "_Ägare"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administratör"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "_Medlem"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "uppmärksammar konversationen"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "gör något annat"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "skriver ett meddelande..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "tog en paus i skrivandet"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - ett oläst meddelande"
+msgstr[1] "Gajim - %d olästa meddelanden"
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - ett oläst enstaka meddelande"
+msgstr[1] "Gajim - %d olästa enstaka meddelanden"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - ett oläst gruppchatmeddelande"
+msgstr[1] "Gajim - %d olästa gruppchatmeddelanden"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - ett oläst privat meddelande"
+msgstr[1] "Gajim - %d olästa privata meddelanden"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fel: kan inte öppna %s för läsning"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "cyan"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "skapar logdatabas"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "för konto %s"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Kunde inte ladda bild"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Kunde inte ansluta till \"%s\""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[Det här meddelandet är krypterat]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Prenumerera"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Adress"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Borta"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Nerladdning"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "Lägger Till Speciellt Meddelande För %s"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "Inte tillgänglig"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Radera"
+
+#~ msgid "Contact _Info"
+#~ msgstr "Kontakt_info"
+
+#~ msgid "Contact Information"
+#~ msgstr "Kontaktinformation"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Ogiltigt rum- eller servernamn"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Okänd D-Busversion: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "publicering av vCard lyckades"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Din personliga information har blivit publicerad"
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Migrerar Logfiler"
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Vänligen vänta medan logfiler blir migrerade..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "Anslut till nytt _rum"
+
+#~ msgid "Hide this menu"
+#~ msgstr "Gömmer denna meny"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - ett oläst meddelande"
+#~ msgstr[1] "Gajim - %d olästa meddelanden"
+
+#~ msgid "Since %s"
+#~ msgstr "Från %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Auktorisera kontakt automatiskt"
 
@@ -5729,17 +6601,10 @@ msgstr "cyan"
 #~ msgid "Open Download Page"
 #~ msgstr "Öppna nerladdningssida"
 
-#~ msgid "Service not available"
-#~ msgstr "Tjänst är inte tillgänglig"
-
 #~ msgid "Session bus is not available."
 #~ msgstr "Sessionsbus finns inte tillgänglig."
 
 #, fuzzy
-#~ msgid "with account %s"
-#~ msgstr "för konto %s"
-
-#, fuzzy
 #~ msgid "with account "
 #~ msgstr "konto: "
 
@@ -5878,9 +6743,6 @@ msgstr "cyan"
 #~ msgid "Click to get contact's extended information"
 #~ msgstr "Klicka för att få kontaktens utökade information"
 
-#~ msgid "Enter your message:"
-#~ msgstr "Skriv ditt meddelande:"
-
 #~ msgid "_Compact View"
 #~ msgstr "_Kompakt vy"
 
@@ -5942,9 +6804,6 @@ msgstr "cyan"
 #~ msgid "Show roster window on Gajim startup"
 #~ msgstr "Visa registerfönstret när Gajim startar"
 
-#~ msgid "_Join Group Chat"
-#~ msgstr "_Anslut till gruppchatt"
-
 #~ msgid "_Service Discovery"
 #~ msgstr "_Tjänstefinnare"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ba86eca61..514f4bf12 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,31 +5,31 @@
 # wwld <wwld@radio.lzusiyu.org>, 2005.
 # kangkang <kanger@gamil.com>, 2005.
 #
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-10-11 10:19+0300\n"
 "PO-Revision-Date: 2006-04-13 11:38+0800\n"
 "Last-Translator: kangkang <kanger@gmail.com>\n"
 "Language-Team: sIyU <jabber@lzusiyu.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: CHINA\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../gajim.desktop.in.h:2
+#: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
 msgstr "Gajim 即时消息软件"
 
-#: ../gajim.desktop.in.h:3
+#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber 即时消息客户端"
 
@@ -46,16 +46,23 @@ msgid "_Discover Services..."
 msgstr "发掘服务(_D)..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "_Group Chat"
 msgstr "群聊(_G)"
 
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "修改帐户(_M)..."
 
 #: ../data/glade/account_context_menu.glade.h:6
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "打开邮件编辑器(_O)"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "状态(_S)"
 
@@ -108,7 +115,7 @@ msgid "Pass_word:"
 msgstr "密码(_W)"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 msgid "Save pass_word"
 msgstr "保存密码(_W)"
 
@@ -133,7 +140,7 @@ msgid "Your JID:"
 msgstr "您的 JID："
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "_Advanced"
 msgstr "高级(_A)"
 
@@ -147,7 +154,7 @@ msgid "_Host:"
 msgstr "主机(_H)："
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:47
 msgid "_Password:"
 msgstr "密码(_P)："
 
@@ -179,10 +186,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>杂项</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>个人信息</b>"
 
@@ -199,6 +208,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "连接丢失后自动重新连接"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Gajim 启动是连接(_O)"
 
@@ -217,6 +227,7 @@ msgstr ""
 "用 TLS 加密接受服务器广播，而使用该选项将禁用 TLS"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "选择您的 OpenPGP 钥匙(_K)..."
 
@@ -233,16 +244,16 @@ msgid "Edit Personal Information..."
 msgstr "编辑个人信息..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
+#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:308 ../src/roster_window.py:1297
+#: ../src/roster_window.py:1795
 msgid "General"
 msgstr "常规"
 
@@ -264,6 +275,7 @@ msgid ""
 msgstr "如果选定，Gajim 会发送数据包防止超时造成的连接断开"
 
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -271,12 +283,14 @@ msgstr ""
 "如果选定，Gajim 会以已读许可方式为您个人把密码保存在 ~/.gajim/config 文件中"
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr "如果选定，Gajim 会在运行时使用本帐户自动连接 jabber"
 
 #: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -293,18 +307,23 @@ msgstr "服务器中保存的关于您的信息"
 msgid "Manage..."
 msgstr "管理..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
+#: ../src/config.py:3339
 msgid "No key selected"
 msgstr "没有选择钥匙"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1172
+#: ../src/config.py:1177 ../src/config.py:1358 ../src/config.py:1573
+#: ../src/config.py:1582 ../src/config.py:1641 ../src/config.py:1714
+#: ../src/config.py:2566 ../src/config.py:3329 ../src/config.py:3338
+#: ../src/dialogs.py:279 ../src/dialogs.py:281
 msgid "None"
 msgstr "(无)"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "个人信息"
 
@@ -326,14 +345,18 @@ msgstr ""
 "据。"
 
 #: ../data/glade/account_modification_window.glade.h:32
+msgid "Priority will change automatically according to your status."
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:33
 msgid "Proxy:"
 msgstr "代理服务器："
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
 msgid "Resour_ce: "
 msgstr "资源(_C)："
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -345,40 +368,46 @@ msgstr ""
 "分。您可以利用“家庭”和“工作”两个资源同时连接到服务器。拥有更高优先级的资源得"
 "到服务器的事件响应。"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "保存密文(_P)(不安全)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "保存与所有联系人的聊天记录(_L)"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "发送防超时数据包"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "将帐户状态与全局状态同步(_R)"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "使用 SSL(_S) (优先)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "使用自定义主机名/端口号"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "使用文件传输代理服务器"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Adjust to status"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:45
 msgid "_Jabber ID:"
 msgstr "Jabber ID(_J)："
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:46
 msgid "_Name: "
 msgstr "名称(_N)："
 
@@ -388,63 +417,92 @@ msgstr "帐户"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
+"If checked, all local contacts that use a Bonjour compatible chat client "
+"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
+"connected to a jabber server for it to work.\n"
+"This is only available if python-avahi is installed and avahi-daemon is "
+"running."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:4
+msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 "如果选定，当您拥有多个帐户时，Gajim 会在列表中列出所有联系人，而看上去他们就"
 "像属于同一个帐户"
 
-#: ../data/glade/accounts_window.glade.h:3
-msgid "_Merge accounts"
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "合并帐户(_M)"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:6
+msgid "_Enable link-local messaging"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:8
 #: ../data/glade/remove_account_window.glade.h:4
 msgid "_Remove"
 msgstr "移除(_R)"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "账户"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "允许他人看到我的状态"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "添加联系人"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "我想添加您到我的联系人名单"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "账户"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "群组"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 #, fuzzy
 msgid "_Nickname:"
 msgstr "昵称："
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "协议："
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "认证(_S)"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "注册(_G)"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "用户 ID"
@@ -534,82 +592,63 @@ msgstr "<b>声音</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "地址"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "高级动作(_V)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "高级设置编辑器"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "状态"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:232
+msgid "Away"
 msgstr "离开"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "忙碌"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "下载"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:242
 msgid "Invisible"
 msgstr "隐身"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "命令"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "正在为 %s 添加特殊通告"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:215
+msgid "Not Available"
 msgstr "不可用"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "自由聊天"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "播放声音(_S)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -622,75 +661,75 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "在群聊窗口中隐藏按钮"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "使用带标签的单个聊天窗口(_T)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "只显示名单中(_R)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "只显示名单中(_R)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "端口："
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -725,7 +764,7 @@ msgstr "加入群聊(_G)"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "添加至名单(_A)"
 
@@ -746,7 +785,8 @@ msgid "_Open Link in Browser"
 msgstr "在浏览器中打开连接(_O)"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Start Chat"
 msgstr "开始聊天(_S)"
@@ -756,7 +796,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "点击查看与该联系人的历史对话"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "发送文件(_F)"
 
@@ -772,7 +813,8 @@ msgstr "紧凑模式(_C)  Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "历史(_H)"
 
@@ -834,7 +876,7 @@ msgstr "该操作会从列表中移除文件传输。如果该传输处于活动
 msgid "When a file transfer is complete show a popup notification"
 msgstr "传输完成后显示弹出气泡提示"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:753
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "继续(_C)"
 
@@ -871,39 +913,34 @@ msgstr ""
 "标语"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
-msgid "Active"
-msgstr "活动"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "粗体"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "正在编写"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "字体风格："
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Gajim 主题自定义"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "已离开"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "未活动的"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "斜体"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -911,7 +948,7 @@ msgstr ""
 "MUC\n"
 "消息"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -919,19 +956,19 @@ msgstr ""
 "MUC 定向的\n"
 "消息"
 
-#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
 msgid "Paused"
 msgstr "已暂停"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "文本颜色(_C)："
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "文本字体(_F)："
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "背景(_B)"
 
@@ -1050,7 +1087,7 @@ msgid "Accept"
 msgstr "接受"
 
 #: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_edit_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
 msgstr "拒绝"
 
@@ -1058,13 +1095,14 @@ msgstr "拒绝"
 msgid "Invitation Received"
 msgstr "收到邀请"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
 msgid "Join Group Chat"
 msgstr "加入群聊"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Nickname:"
 msgstr "昵称："
 
@@ -1082,13 +1120,8 @@ msgstr "最近："
 msgid "Room:"
 msgstr "房间："
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "服务器："
-
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
+#: ../src/disco.py:1513
 msgid "_Join"
 msgstr "加入(_J)"
 
@@ -1113,6 +1146,10 @@ msgstr "书签管理"
 msgid "Print status:"
 msgstr "显示时间："
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "服务器："
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "标题："
@@ -1134,7 +1171,8 @@ msgid "Manage Proxy Profiles"
 msgstr "代理服务器模板管理"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "Name:"
 msgstr "名称："
 
@@ -1150,20 +1188,21 @@ msgstr "使用验证"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "点这里插入表情符 (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP 加密"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/subscription_request_window.glade.h:5
 msgid "_Actions"
 msgstr "动作(_A)"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:249
+#: ../src/filetransfers_window.py:253
 msgid "_Send"
 msgstr "发送(_S)"
 
@@ -1236,18 +1275,25 @@ msgid "Also known as iChat style"
 msgstr "也就是 i 聊天风格"
 
 #: ../data/glade/preferences_window.glade.h:20
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
 msgstr "询问状态消息，当我："
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "自动离开(_A)："
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "自动不可用(_N)："
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1259,19 +1305,19 @@ msgstr ""
 "总是使用 KDE 默认应用\n"
 "自定义"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid "B_efore nickname:"
 msgstr "在昵称前：(_E)"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
 msgid "Chat"
 msgstr "聊天"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Chat state noti_fications:"
 msgstr "聊天状态指示(_F)："
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1280,35 +1326,40 @@ msgstr ""
 "当被不在名单中的联系人骚扰时，检查此选项。它会屏蔽所有名单之外联系人的消息，"
 "请谨慎使用。"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "状态消息"
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default status _iconset:"
 msgstr "默认状态图标设置:(_I)"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display a_vatars of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display status _messages of contacts in roster"
 msgstr "显示名单中联系人的状态消息(_M)"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "E_very 5 minutes"
 msgstr "每 5 分钟(_V)"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Emoticons:"
 msgstr "表情符："
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:39
 msgid "Events"
 msgstr "事件"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1317,53 +1368,59 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定发给第三方的角"
 "色。"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr "Gajim 会自动弹出相关窗口以显示新的事件"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示新消息"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚登录的联系人"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚离开的联系人"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim 仅会改变触发了新事件的联系人图标"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中联系人名下方显示联系人状态消息"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
 msgstr "如果选定，Gajim 会在下次运行时使用本次设定的名单及聊天窗口的位置和大小"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1372,17 +1429,17 @@ msgstr ""
 "如果选定，Gajim 会以协议特定方式显示状态图标。(例如，MSN 联系人会以 MSN 相同"
 "图标方式显示，以表示在线，离开，忙，等等...)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 msgstr "如果不禁用，Gajim 会用相应的图片表情符替代字符表情,例如“:)”"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "管理...(_N)"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1394,80 +1451,84 @@ msgstr ""
 "每一个帐号\n"
 "每种类型"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:58
 msgid "Notify me about contacts that: "
 msgstr "提醒我关于联系人："
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "发送新的 Gmail 邮件进行通知(_G)"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:60
 msgid "On every _message"
 msgstr "对于每条消息(_M)"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:61
 msgid "One message _window:"
 msgstr "消息窗口：(_W)"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Play _sounds"
 msgstr "播放声音(_S)"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Preferences"
 msgstr "参数"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Print time:"
 msgstr "显示时间："
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Save _position and size for roster and chat windows"
 msgstr "保存名单和聊天窗口的位置及大小(_P)"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Show only in _roster"
 msgstr "只显示名单中(_R)"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "登录(I)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "退出登录"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Status"
 msgstr "状态"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:71
 msgid "T_heme:"
 msgstr "主题：(_H)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:72
 msgid "The auto away status message"
 msgstr "自动离开状态消息"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:73
 msgid "The auto not available status message"
 msgstr "自动不可用状态消息"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Use _transports iconsets"
 msgstr "使用代理的图标设定(_T)"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "使用托盘图标(aka. 提示区域图表)(_R)"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -1477,151 +1538,160 @@ msgstr ""
 "下列方式可用来提示您收到新的事件（消息，文件传输请求等）。请注意，只有未和您"
 "进行聊天的用户发送的新消息才会触发新消息事件"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "When new event is received"
 msgstr "当新事件发生时"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "高级设置编辑器"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid "_After time:"
 msgstr "在该时间后：(_A)"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:81
 msgid "_Before time:"
 msgstr "在该时间前：(_B)"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Browser:"
 msgstr "浏览器(_B)："
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_File manager:"
 msgstr "文件管理器：(_F)"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
 msgid "_Font:"
 msgstr "字号：(_F)"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Highlight misspelled words"
 msgstr "拼写检查(_H)"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Ignore events from contacts not in the roster"
 msgstr "忽略名单以外的联系人触发的事件(_I)"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Incoming message:"
 msgstr "抵达的消息：(_I)"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Log status changes of contacts"
 msgstr "记录联系人状态变化(_L)"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Mail client:"
 msgstr "邮件客户端(_M)："
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Never"
 msgstr "从不(_N)"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Notify me about it"
 msgstr "提醒我(_N)"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Open..."
 msgstr "打开...(_O)"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Outgoing message:"
 msgstr "将要送出的消息：(_O)"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Player:"
 msgstr "参与者(_P)"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Pop it up"
 msgstr "弹出(_P)"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "恢复为默认颜色设置(_R)"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Sort contacts by status"
 msgstr "按状态分类联系人(_S)"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Status message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_URL:"
 msgstr "URL：(_U)"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:100
 msgid "minutes"
 msgstr "分钟"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "私聊"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>行格式</b>"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:3
+#: ../data/glade/privacy_list_window.glade.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/glade/privacy_list_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "Gajim 启动是连接(_O)"
+
+#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "删除"
-
-#: ../data/glade/privacy_list_edit_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "Order:"
 msgstr "服务器："
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
 #, fuzzy
 msgid "Privacy List"
 msgstr "封禁名单"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 #, fuzzy
 msgid "all by subscription"
 msgstr "认证(_S)"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all in the group"
 msgstr "群组内"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1629,32 +1699,172 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 #, fuzzy
 msgid "to send me messages"
 msgstr "发送消息"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me status"
 msgstr "要求查看他人的状态"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to view my status"
 msgstr "允许他人看到我的状态"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr ""
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "关于"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr ""
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "地址"
+
+#: ../data/glade/profile_window.glade.h:4
+#, fuzzy
+msgid "Avatar:"
+msgstr "详细设置"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "生日"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "城市："
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Company:"
+msgstr "公司："
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Country:"
+msgstr "国家："
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Department:"
+msgstr "部门："
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail ："
+
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Extra Address:"
+msgstr "附加地址："
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Family:"
+msgstr "家族："
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:18
+msgid "Format: YYYY-MM-DD"
+msgstr "格式： YYYY-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Given:"
+msgstr "教名："
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Homepage:"
+msgstr "主页："
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Middle:"
+msgstr "中间："
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "More"
+msgstr "更多"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:29
+#, fuzzy
+msgid "Personal Info"
+msgstr "个人信息"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
+msgstr "电话号码："
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
+msgstr "位置："
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
+msgstr "邮政编码："
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
+msgstr "前缀："
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+msgid "Role:"
+msgstr "角色："
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "State:"
+msgstr "州："
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Street:"
+msgstr "街道："
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
+msgstr "后缀："
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
+msgstr "工作"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "发布(_P)"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "找回(_R)"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1674,47 +1884,58 @@ msgid "A_sk to see his/her status"
 msgstr "要求查看他人的状态"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 msgid "Add Special _Notification"
 msgstr "添加特殊提示(_N)"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "指定 Open_PGP 密钥"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1774
 msgid "Edit _Groups"
 msgstr "编辑群组"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1732
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "发送单条消息(_M)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "开始群聊(_C)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "允许他人看到我的状态"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "禁止他人看到我的状态"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
 msgid "_Remove from Roster"
 msgstr "从名单中移除(_R)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:1861
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "认证(_S)"
 
@@ -1739,42 +1960,53 @@ msgid "Help online"
 msgstr "在线帮助"
 
 #: ../data/glade/roster_window.glade.h:7
-msgid "Profile, Avatar"
+#, fuzzy
+msgid "Profile, A_vatar"
 msgstr "模板，明细"
 
 #: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Show Trans_ports"
+msgstr "代理"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "显示离线联系人"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "发掘服务(_D)"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
+#: ../src/roster_window.py:1853
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_FAQ"
 msgstr "常见问题(_A)"
 
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "退出(_Q)"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "语音(_V)"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "到(_O)"
@@ -1844,22 +2076,18 @@ msgid "Authorize contact so he can know when you're connected"
 msgstr "向联系人授权，使他知道您是否连接"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "联系人信息(_I)"
-
-#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "拒绝向联系人授权。他人将无法知道您是否在线"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Subscription Request"
 msgstr "认证请求"
 
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Authorize"
 msgstr "授权(_A)"
 
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "拒绝(_D)"
 
@@ -1875,164 +2103,51 @@ msgstr "显示名单(_R)"
 msgid "Sta_tus"
 msgstr "状态(_T)"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "关于"
-
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "地址"
-
-#: ../data/glade/vcard_information_window.glade.h:4
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "请求："
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "生日"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "城市："
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "客户端："
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "公司："
-
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "联系人信息"
-
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "国家："
-
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "部门："
-
-#: ../data/glade/vcard_information_window.glade.h:12
-msgid "E-Mail:"
-msgstr "E-Mail ："
-
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Extra Address:"
-msgstr "附加地址："
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "家族："
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "格式： YYYY-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "教名："
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "主页："
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "联系人"
 
 #: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
 msgid "Jabber ID:"
 msgstr "Jabber ID"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "定位"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "中间："
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "更多"
-
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "OS:"
 msgstr "操作系统："
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "电话号码："
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "位置："
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "邮政编码："
-
-#. Prefix in Name
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Prefix:"
-msgstr "前缀："
-
 #: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "资源："
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "角色："
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "详细设置"
-
 #: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "州："
-
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "状态："
 
-#: ../data/glade/vcard_information_window.glade.h:40
-msgid "Street:"
-msgstr "街道："
-
+#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Subscription:"
 msgstr "认证："
 
-#. Suffix in Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Suffix:"
-msgstr "后缀："
-
-#: ../data/glade/vcard_information_window.glade.h:44
-msgid "Work"
-msgstr "工作"
-
 #: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "记录聊天历史(_L)"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "发布(_P)"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "找回(_R)"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber 通信</b>"
@@ -2064,30 +2179,165 @@ msgstr "消息(_M)"
 msgid "_Presence"
 msgstr "在场(_P)"
 
-#: ../src/advanced.py:65
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, fuzzy
+msgid "First Name:"
+msgstr "名称："
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "名称："
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "个人明细"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+#, fuzzy
+msgid "Modify Account"
+msgstr "修改帐户(_M)..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "使用自定义主机名/端口号"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "优先名称"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "值"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "类型"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(无)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "隐藏"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:52
+msgid "English"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Briton"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Czech"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "German"
+msgstr "常规"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "绿色"
+
+#: ../src/chat_control.py:52
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Spanish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Basc"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "French"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Croatian"
+msgstr "定位"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "斜体"
+
+#: ../src/chat_control.py:52
+msgid "Norvegian b"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Dutch"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Norvegian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Polish"
+msgstr "发布(_P)"
+
+#: ../src/chat_control.py:52
+msgid "Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Russian"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Slovak"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Swedish"
+msgstr ""
+
+#: ../src/chat_control.py:52
+msgid "Chinese (Ch)"
+msgstr ""
+
+#: ../src/chat_control.py:201 ../src/dialogs.py:1453
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2102,274 +2352,329 @@ msgstr ""
 "\n"
 "拼写检查功能未启用"
 
+#: ../src/chat_control.py:239
+msgid "Spelling language"
+msgstr ""
+
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "连接不可用"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:834
 msgid "Chats"
 msgstr "聊天"
 
+#: ../src/chat_control.py:1022
+#, fuzzy, python-format
+msgid "%(nickname)s from room %(room_name)s"
+msgstr "%(nickname)s： %(message)s"
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1107
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr " %s 没有广播 OpenPGP 公钥或您未指定"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1234
 msgid "Encryption enabled"
 msgstr "启用加密"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1239
 msgid "Encryption disabled"
 msgstr "禁用加密"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
+#: ../src/dialogs.py:627 ../src/gajim.py:678 ../src/gajim.py:679
+#: ../src/gajim.py:1006 ../src/roster_window.py:294
+#: ../src/roster_window.py:1442 ../src/roster_window.py:1601
+#: ../src/roster_window.py:2104 ../src/roster_window.py:2306
+#: ../src/roster_window.py:2317 ../src/roster_window.py:2681
+#: ../src/roster_window.py:2737 ../src/roster_window.py:3573
+#: ../src/roster_window.py:3575 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:244
 msgid "Not in Roster"
 msgstr "不在名单中"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1526
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "收到一条来自 “%s” 的消息"
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1527
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:127 ../src/config.py:564
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../src/config.py:199
+#: ../src/config.py:205
 #, python-format
 msgid "Every %s _minutes"
 msgstr "每 %s 分钟(m)"
 
-#: ../src/config.py:334
+#: ../src/config.py:336
+msgid "Active"
+msgstr "活动"
+
+#: ../src/config.py:344
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:881
+#: ../src/config.py:654 ../src/gajim.py:1978
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "连接不可用"
+
+#: ../src/config.py:655 ../src/gajim.py:1979
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+
+#: ../src/config.py:993
 msgid "status message title"
 msgstr "状态消息标题"
 
-#: ../src/config.py:881
+#: ../src/config.py:993
 msgid "status message text"
 msgstr "状态消息文本"
 
-#: ../src/config.py:916
+#: ../src/config.py:1028
 msgid "First Message Received"
 msgstr "最初收到的消息"
 
-#: ../src/config.py:917
+#: ../src/config.py:1029
 msgid "Next Message Received"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:918
+#: ../src/config.py:1030
 msgid "Contact Connected"
 msgstr "已连接的联系人"
 
-#: ../src/config.py:919
+#: ../src/config.py:1031
 msgid "Contact Disconnected"
 msgstr "联系人已断开连接"
 
-#: ../src/config.py:920
+#: ../src/config.py:1032
 msgid "Message Sent"
 msgstr "消息已发送"
 
-#: ../src/config.py:921
+#: ../src/config.py:1033
 msgid "Group Chat Message Highlight"
 msgstr "群聊消息突出显示"
 
-#: ../src/config.py:922
+#: ../src/config.py:1034
 msgid "Group Chat Message Received"
 msgstr "收到的群聊消息"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1234
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP 在本机不可用"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1280
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1281
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1284 ../src/config.py:1868
 msgid "Unread events"
 msgstr "未读取的事件"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1285
 msgid "To change the account name, you must read all pending events."
 msgstr "如要更改账户名称，需先处理所有未决事件"
 
-#: ../src/config.py:1163
+#: ../src/config.py:1289
 msgid "Account Name Already Used"
 msgstr "帐户名已经被占用"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1290
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1294 ../src/config.py:1298
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1295
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1173
+#: ../src/config.py:1299
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
+#: ../src/config.py:2952
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1314
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
 
-#: ../src/config.py:1244
+#: ../src/config.py:1372
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1373
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:1366
+#: ../src/config.py:1496 ../src/common/config.py:354
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: ../src/config.py:1376
+#: ../src/config.py:1506
 msgid "Relogin now?"
 msgstr "现在重新登录？"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1507
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有调整立即生效，您必须重新登录。"
 
-#: ../src/config.py:1403
+#: ../src/config.py:1533
 msgid "No such account available"
 msgstr "没有有效账户"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1534
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
+#: ../src/disco.py:414 ../src/profile_window.py:314
+#: ../src/profile_window.py:380
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1541
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:1435
+#: ../src/config.py:1545
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1546
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "您必须在编辑个人信息前创建账户。"
+
+#: ../src/config.py:1570 ../src/config.py:3326
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1571 ../src/config.py:3327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "在取回 OpenPGP 密钥时发生错误。"
 
-#: ../src/config.py:1439
+#: ../src/config.py:1574 ../src/config.py:3330
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密钥选择"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1575 ../src/config.py:3331
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 钥匙"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
+#: ../src/history_window.py:78
 msgid "Name"
 msgstr "名称"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1807
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1869
 msgid "Read all pending events before removing this account."
 msgstr "移除帐号前请阅读所有未决事件。"
 
-#: ../src/config.py:1911
+#: ../src/config.py:1903
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "没有活动的账户"
+
+#: ../src/config.py:1904
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1959
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "帐户名已经被占用"
+
+#: ../src/config.py:1959
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2185
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2187
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2258
 msgid "Ban List"
 msgstr "封禁名单"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2259
 msgid "Member List"
 msgstr "成员列表"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2260
 msgid "Owner List"
 msgstr "房主列表"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2261
 msgid "Administrator List"
 msgstr "管理员列表"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2302
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2307
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2311
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2332
 msgid "Banning..."
 msgstr "封禁..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2334
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2377,11 +2682,11 @@ msgstr ""
 "<b>想做封禁谁？</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2336
 msgid "Adding Member..."
 msgstr "正在添加成员..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2337
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2389,11 +2694,11 @@ msgstr ""
 "<b>想要将谁加为成员？</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2339
 msgid "Adding Owner..."
 msgstr "添加房主..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2340
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2401,11 +2706,11 @@ msgstr ""
 "<b>想要将谁加为房主？</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2342
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2343
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2413,7 +2718,7 @@ msgstr ""
 "<b>想要指定谁为管理员？</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2344
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2429,87 +2734,88 @@ msgstr ""
 "4. domain (该域本身匹配, 例如任何 user@domain,\n"
 "domain/resource, 或者地址包含一个子域."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2449
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2466 ../src/roster_window.py:2370
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2467 ../src/roster_window.py:2371
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2468 ../src/roster_window.py:2372
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2481
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2482
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，将会丢失连接"
 
-#: ../src/config.py:2282
+#: ../src/config.py:2566
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "新房间"
+#: ../src/config.py:2636
+#, fuzzy
+msgid "New Group Chat"
+msgstr "群聊"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2667
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2668
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
 
-#: ../src/config.py:2638
+#: ../src/config.py:2928
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2929
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2938 ../src/dialogs.py:1276
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2939
 msgid "You must enter a password for the new account."
 msgstr "必须为新账户输入密码。"
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2943 ../src/dialogs.py:1281
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2944 ../src/dialogs.py:1282
 msgid "The passwords typed in both fields must be identical."
 msgstr "两次密码输入不一致。"
 
-#: ../src/config.py:2673
+#: ../src/config.py:2963
 msgid "Duplicate Jabber ID"
 msgstr "复制 Jabber ID"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2964
 msgid "This account is already configured in Gajim."
 msgstr "此帐号已在 Gajim 中配置过。"
 
-#: ../src/config.py:2691
+#: ../src/config.py:2981
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2982 ../src/config.py:3015
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2517,531 +2823,587 @@ msgstr ""
 "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单"
 "项。"
 
-#: ../src/config.py:2724
+#: ../src/config.py:3014
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3030
 msgid "An error occured during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3087
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3088
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 msgstr "以下文字是您上次发言至今的群聊内容"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:342
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "“%s”的动作"
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "读取 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "从字典(_D)中搜索"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "字典地址缺少 “%s” 并且它不是 WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网站搜索地址缺少 “%s”"
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "用网页搜索(_S)"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:397
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:702
 msgid "Yesterday"
 msgstr "昨天"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:706
 #, python-format
 msgid "%i days ago"
 msgstr "%i 天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:785
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题：%s\n"
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:32
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "本机缺少 D-Bus python 绑定"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Gajim 的 D-Bus 兼容性无法使用"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:58
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "联系人名称：<i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:60
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID： <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:210
 msgid "Group"
 msgstr "群组"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:217
 msgid "In the group"
 msgstr "群组内"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:268
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:271
 msgid "Contact name"
 msgstr "联系人名"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:316
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 状态消息"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:318
 msgid "Status Message"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:393
 msgid "Save as Preset Status Message"
 msgstr "<b>保存为预设状态消息</b>"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:394
 msgid "Please type a name for this status message"
 msgstr "请为该状态信息键入名称："
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:415
+#, fuzzy
+msgid "AIM Address:"
+msgstr "地址(_A):"
+
+#: ../src/dialogs.py:416
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:417
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:418
+#, fuzzy
+msgid "MSN Address:"
+msgstr "地址(_A):"
+
+#: ../src/dialogs.py:419
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "附加地址："
+
+#: ../src/dialogs.py:455
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "请为账户 %s 填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:457
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:465 ../src/disco.py:100 ../src/disco.py:101
+#: ../src/disco.py:1248 ../src/roster_window.py:229
+#: ../src/roster_window.py:291 ../src/roster_window.py:327
+#: ../src/roster_window.py:379 ../src/roster_window.py:401
+#: ../src/roster_window.py:3569 ../src/roster_window.py:3571
+#: ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "代理"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:607 ../src/dialogs.py:613
 msgid "Invalid User ID"
 msgstr "无效的用户 ID"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:614
 msgid "The user ID must not contain a resource."
 msgstr "该用户 ID 不可包含任何源"
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:628
 msgid "Contact already in roster"
 msgstr "联系人已经在名单中"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:629
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已在名单中。"
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:663
+#, fuzzy
+msgid "User ID:"
+msgstr "用户 ID"
+
+#: ../src/dialogs.py:720
 msgid "A GTK+ jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:721
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:722
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:730
 #, fuzzy
 msgid "Current Developers:"
 msgstr "既往开发作者："
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:732
 msgid "Past Developers:"
 msgstr "既往开发作者："
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:736
 msgid "THANKS:"
 msgstr "感谢："
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:742
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "最后但不是最重要的，我们要特别感谢所有的软件维护人员。"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:756
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
 "kangkang <kanger@gmail.com>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:886
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "无法加入房间"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:887
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1029
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "该认证要求来自帐户 %s 由 %s 发送"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1032
 #, python-format
 msgid "Subscription request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1092 ../src/roster_window.py:599
+#, python-format
+msgid "You are already in room %s"
+msgstr "房间“%s”已在您的书签中。"
+
+#: ../src/dialogs.py:1100
 msgid "You can not join a group chat unless you are connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1115
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "无效房间或服务器名"
+#: ../src/dialogs.py:1184
+#, fuzzy
+msgid "Invalid room Jabber ID"
+msgstr "无效的 Jabber ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1185
+#, fuzzy
+msgid "The room Jabber ID has not allowed characters."
 msgstr "房间名或服务器名包含了非法字符。"
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1208
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1210
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1211
 #, fuzzy
 msgid ""
-"Fill in the jid, or nick of the contact you would like\n"
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 "填写您想交谈的\n"
 "联系人 ID："
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认已连接到 “%s”。"
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
 #, fuzzy
 msgid "Invalid JID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1249
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1258
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1277
 msgid "You must enter a password."
 msgstr "此处必须输入密码"
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
 msgid "New Message"
 msgstr "新消息"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
 msgid "New Single Message"
 msgstr "新消息"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
 msgid "New Private Message"
 msgstr "新的个人消息"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
 msgid "New E-mail"
 msgstr "新的电子邮件"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
+#: ../src/notify.py:422
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
+#: ../src/gajim.py:1306 ../src/notify.py:424
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
 msgid "Groupchat Invitation"
 msgstr "群聊邀请"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "联系人退出登录"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1521
+#, fuzzy, python-format
+msgid "Single Message using account %s"
 msgstr "账户 %s 的消息"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1523
+#, fuzzy, python-format
+msgid "Single Message in account %s"
+msgstr "账户 %s 的消息"
+
+#: ../src/dialogs.py:1525
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1528
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1551
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1618
 #, python-format
 msgid "RE: %s"
 msgstr "回复： %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1619
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道：\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1663
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1665
 msgid "XML Console"
 msgstr " XML 控制台"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1787
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1791
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1838
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1841
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "描述： %s"
+
+#: ../src/dialogs.py:1878
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>行格式</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1965
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>行格式</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2064
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "私聊"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 房间"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Comment: %s"
 msgstr "注释： %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2223
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2238
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2268
 msgid "Choose Image"
 msgstr "选择形象"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2283
 msgid "Images"
 msgstr "形象"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2340
 #, python-format
 msgid "When %s becomes:"
 msgstr "当 %s 变为："
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2342
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在为 %s 添加特殊通告"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2413
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2419
 #, fuzzy
 msgid "Condition"
 msgstr "连接"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2540
+msgid "when I am "
+msgstr ""
+
+#: ../src/disco.py:99
 msgid "Others"
 msgstr "其他"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:103
 msgid "Conference"
 msgstr "会议"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:415
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:494
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帐号 %s 来发掘服务"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:496
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: ../src/disco.py:629
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr "此地址没有服务或无应答。请检查地址后重试。"
 
-#: ../src/disco.py:633 ../src/disco.py:915
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: ../src/disco.py:714
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "浏览 %s 在帐户 %s 上"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1138 ../src/disco.py:1253
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1290
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "已扫描 %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1471
 msgid "Users"
 msgstr "用户"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1478
 msgid "Description"
 msgstr "描述"
 
+#. Id column
+#: ../src/disco.py:1485
+msgid "Id"
+msgstr ""
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "文件"
@@ -3059,7 +3421,7 @@ msgstr "进程"
 msgid "Filename: %s"
 msgstr "文件名： %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "大小： %s"
@@ -3067,17 +3429,17 @@ msgstr "大小： %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:454
+#: ../src/history_manager.py:459
 msgid "You"
 msgstr "您"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "发送者： %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:556
-#: ../src/tooltips.py:639
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:600
 msgid "Recipient: "
 msgstr "接收者： %s"
 
@@ -3098,78 +3460,88 @@ msgstr "文件传输已取消"
 msgid "Connection with peer cannot be established."
 msgstr "无法与对方建立连接。"
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "接收者： %s"
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "读文件错误："
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "文件传输被对方中止"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "选择要发送的文件..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim 无法访问此文件"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "此文件正在被其它程序使用。"
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "文件： %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "类型：%s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "Description: %s"
 msgstr "描述： %s"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:304
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s 想发送给您一个文件："
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:312
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
 msgid "What do you want to do?"
 msgstr "想做什么？"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "另存为..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:420
+#: ../src/filetransfers_window.py:427
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3177,121 +3549,316 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:492
+#: ../src/filetransfers_window.py:500
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:528 ../src/filetransfers_window.py:531
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "无效文件"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "文件："
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: ../src/filetransfers_window.py:552 ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
+#: ../src/tooltips.py:590
 msgid "Name: "
 msgstr "名称："
 
-#: ../src/filetransfers_window.py:554 ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
 msgid "Sender: "
 msgstr "发送者："
 
-#: ../src/filetransfers_window.py:742
+#: ../src/filetransfers_window.py:750
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/gajim-remote.py:82
-msgid "shows a help on specific command"
+#: ../src/gajim.py:48
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "运行 Gajim 需要 X 服务器。退出..."
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim 需要 PyGTK 2.6 或更高版本"
+
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "运行 Gajim 需要 PyGTK 2.6 或更高版本。退出..."
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim 需要 GTK 2.6 或更高版本"
+
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "运行 Gajim 需要 GTK 2.6 或更高版本。退出..."
+
+#: ../src/gajim.py:61
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ 运行时环境缺少 libglade 支持"
+
+#: ../src/gajim.py:63
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr "请移除当前的 GTK+ 运行时环境并从 %s 安装最新稳定版本"
+
+#: ../src/gajim.py:65
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr "请确认您系统中 gtk+ 及 pygtk 对 libglade 的支持。"
+
+#: ../src/gajim.py:70
+msgid "Gajim needs PySQLite2 to run"
+msgstr "运行 Gajim 需要 PySQLite2 "
+
+#: ../src/gajim.py:77
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "运行 Gajim 需要 PySQLite2 "
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:158
+msgid "Gajim is already running"
+msgstr ""
+
+#: ../src/gajim.py:159
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+
+#: ../src/gajim.py:259
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) 授权给 %s (id: %s)"
+
+#: ../src/gajim.py:260
+msgid "Do you accept this request?"
+msgstr "是否接受这个请求？"
+
+#: ../src/gajim.py:306 ../src/notify.py:432
+#, fuzzy
+msgid "Connection Failed"
+msgstr "连接"
+
+#: ../src/gajim.py:609
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "主题：%s\n"
+
+#: ../src/gajim.py:654
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "发送 %s ( %s ) 时出现错误"
+
+#: ../src/gajim.py:694
+msgid "Authorization accepted"
+msgstr "授权被接受"
+
+#: ../src/gajim.py:695
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "联系人“%s”已授权您查看他/她的状态。"
+
+#: ../src/gajim.py:703
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "联系人“%s”移除了来自您的认证"
+
+#: ../src/gajim.py:704
+msgid "You will always see him or her as offline."
+msgstr "您将一直看到他/她的状态为离线。"
+
+#: ../src/gajim.py:747
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "无法与对方“ %s ”建立连接。"
+
+#: ../src/gajim.py:748 ../src/common/connection.py:389
+msgid "Check your connection or try again later."
+msgstr "检查连接并稍后重试。"
+
+#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s 正在 %s (%s)."
+
+#: ../src/gajim.py:981
+msgid "Your passphrase is incorrect"
+msgstr "您的密文不正确"
+
+#: ../src/gajim.py:982
+msgid "You are currently connected without your OpenPGP key."
+msgstr "已建立没有 OpenPGP 密钥的连接"
+
+#: ../src/gajim.py:1084
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr " %(gmail_mail_address)s 上的新邮件"
+
+#: ../src/gajim.py:1086
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "您有 %d 条新邮件信息"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1095
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1228
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s 想发送给您一个文件。"
+
+#: ../src/gajim.py:1290
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "你成功的从 %(name)s 收到文件  %(filename)s。"
+
+#. ft stopped
+#: ../src/gajim.py:1294
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
+
+#: ../src/gajim.py:1307
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
+
+#. ft stopped
+#: ../src/gajim.py:1311
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
+
+#: ../src/gajim.py:1413
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1414
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>请填写您新同账户的数据</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1747
+msgid "Could not save your settings and preferences"
+msgstr "无法保存您的设置。"
+
+#: ../src/gajim.py:1998
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "会话管理器支持不可用(丢失 gnome.ui 模块)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "为特定命令显示帮助"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "命令"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "为命令显示帮助"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "显示/隐藏名单窗口"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:78
 msgid "Popups a window with the next unread message"
 msgstr "为下一条未读消息弹出窗口"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:82
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr "打印名单中所有联系人。每个联系人一行。"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:172
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "账户"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "只显示指定帐户的联系人"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "打印注册的账户"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "改变一个或多个账户状态"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "status"
 msgstr "状态"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "下列中的一项： 离线，在线，聊天，离开，不可用, dnd, 隐身"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "消息"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "状态消息"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:98
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr "改变账户的状态。如果不指明，将改变设置“与全局同步”选项的账户"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "显示对话框用于给联系人发送消息"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，将从此帐户列表下移出联系人"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:113
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -3301,27 +3868,27 @@ msgstr ""
 "发送新消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而不需"
 "要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "消息内容"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "PGP 钥匙"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，该消息将使用本公共密钥加密"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，消息将被用此账户发送"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:126
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -3331,125 +3898,140 @@ msgstr ""
 "发送新消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而不需"
 "要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "subject"
 msgstr "主题"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 #, fuzzy
 msgid "message subject"
 msgstr "消息已发送"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "获得联系人的详细信息"
 
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:171
-#: ../src/gajim-remote.py:201 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "联系人的 JID "
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "获得帐号的详细信息"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "帐号名称"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "向联系人发送文件"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "文件"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "文件路径"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，文件将被用此账户发送"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "列出所有的参数及它们的值"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "将“密钥”的值设为“值”"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "键=值"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "“密钥”是参数名，而“值”是赋予参数的数值"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "删除一个参数项"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "键"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "需要删除的参数名"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "将当前Gajim的国家设置写入 .config 文件"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "从名单移除联系人"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "向名单添加联系人"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:194
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:195
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "为此账户加入新联系人。"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:207
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "未读消息的回复总数"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:224
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote.py:226
+#, fuzzy
+msgid "XML to send"
+msgstr " XML 控制台"
+
+#: ../src/gajim-remote.py:227
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的“联系人 JID”参数"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3458,16 +4040,11 @@ msgstr ""
 "\"%s\" 不在您的名单中。\n"
 "请为发送此消息指定账户。"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "未知的 D-Bus 版本： %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3476,16 +4053,16 @@ msgstr ""
 "用法： %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "参数："
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3494,7 +4071,7 @@ msgstr ""
 "用法：%s 命令 [参数] \n"
 "命令是下列之一：\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3503,322 +4080,134 @@ msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "运行 Gajim 需要 X 服务器。退出..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim 需要 PyGTK 2.6 或更高版本"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "运行 Gajim 需要 PyGTK 2.6 或更高版本。退出..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim 需要 GTK 2.6 或更高版本"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "运行 Gajim 需要 GTK 2.6 或更高版本。退出..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ 运行时环境缺少 libglade 支持"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr "请移除当前的 GTK+ 运行时环境并从 %s 安装最新稳定版本"
-
-#: ../src/gajim.py:65
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "请确认您系统中 gtk+ 及 pygtk 对 libglade 的支持。"
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "运行 Gajim 需要 PySQLite2 "
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr ""
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) 授权给 %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "是否接受这个请求？"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "发送 %s ( %s ) 时出现错误"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "授权被接受"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "联系人“%s”已授权您查看他/她的状态。"
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "联系人“%s”移除了来自您的认证"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "您将一直看到他/她的状态为离线。"
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "无法与对方“ %s ”建立连接。"
-
-#: ../src/gajim.py:705 ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "检查连接并稍后重试。"
-
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s 正在 %s (%s)."
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "您的密文不正确"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "已建立没有 OpenPGP 密钥的连接"
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr " %(gmail_mail_address)s 上的新邮件"
-
-#: ../src/gajim.py:1035
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] "您有 %d 条新邮件信息"
-
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s 想发送给您一个文件。"
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "你成功的从 %(name)s 收到文件  %(filename)s。"
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr " vCard 发布成功"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "您的个人信息被成功发布。"
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "vCard 发布失败"
-
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr "发布您的个人信息时发生错误，请稍后重试。"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
-msgid "Could not save your settings and preferences"
-msgstr "无法保存您的设置。"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "会话管理器支持不可用(丢失 gnome.ui 模块)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "正在移动日志..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "请等待日志被移动..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "主题"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "主题名称"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "无法删除当前主题"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "私聊"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "私聊"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
+#: ../src/groupchat_control.py:122
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "您不再在房间“%s”中或“%s”已离开。"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "群聊"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "群聊"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "更换昵称(_N)"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "该房间无话题"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:784
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:788
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:795
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:799
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:807
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:809
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s 现在成了 %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:890
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:895
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
 #, python-format
 msgid "%s is now %s"
 msgstr "%s 正在 %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "昵称未找到： %s "
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1050
+msgid "This room has no subject"
+msgstr "该房间无话题"
+
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "邀请 %(contact_jid)s 到 %(room_jid)s。"
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr " %s 可能不是有效的 JID "
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1181
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "没有此命令：/%s ( 如果想送出，请用请用前缀 /say )"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1204
 #, python-format
 msgid "Commands: %s"
 msgstr "命令： %s "
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1206
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3829,44 +4218,44 @@ msgstr ""
 "用法：/%s <昵称|JID> [原因]，从此房间封禁 JID。昵称可能被代替，除了包含“@”。"
 "如果 JID 在房间里，他/她/它将被踢出。注意：不支持包含空格的昵称。"
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1212
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr "用法：/%s <昵称>, 为指定房主打开一个私聊窗口"
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "用法：/%s，清除文本窗口。"
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1218
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr "用法：/%s [原因]，关闭当前窗口或标签，如果指定将显示原因。"
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "用法：/%s，隐藏聊天按钮。"
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1224
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
 "providing a reason."
 msgstr "用法：/%s <JID> [原因]，邀请 JID 到当前房间，可以提供一个原因。"
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1228
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr "用法: /%s <房间>@<服务器>[/昵称], 申请以指定昵称加入“房间@服务器”。"
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1232
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -3876,7 +4265,7 @@ msgstr ""
 "用法：/%s <昵称> [原因]，通过昵称移除房主，原因可选。注意：不支持含空格的昵"
 "称。"
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -3884,7 +4273,7 @@ msgid ""
 msgstr ""
 "用法：/%s <动作>，发送动作到当前房间。使用第三人称。(例如：/%s exploeds)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -3892,185 +4281,185 @@ msgid ""
 msgstr ""
 "用法： /%s <昵称> [消息], 打开一个私聊窗口并且向指定昵称的联系人发送消息 "
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "用法：/%s <昵称>，改变昵称。"
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1250
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "用法：/%s [主题]，显示或更新房间的主题。"
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1254
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "用法：/%s [主题]，显示或更新房间的主题。"
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1257
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "用法：/%s <消息>，不使用其他命令发送消息。"
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "No help info for /%s"
 msgstr "没有 /%s 的帮助信息"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "确定要离开房间“ %s ”？"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1310
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "如果关闭此窗口，您将断开此房间的连接。"
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1314
 msgid "Do _not ask me again"
 msgstr "不再提问此问题(_N)"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1348
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1349
 msgid "Please specify the new subject:"
 msgstr "请指定新话题："
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1358
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1359
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称："
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1385
 msgid "Bookmark already set"
 msgstr "书签已设定"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1386
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "房间“%s”已在您的书签中。"
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1395
 msgid "Bookmark has been added successfully"
 msgstr "书签添加成功"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1396
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以通过“动作”菜单管理您的名单。"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1513
 #, python-format
 msgid "Kicking %s"
 msgstr "踢出 %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因："
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1796
 #, python-format
 msgid "Banning %s"
 msgstr "封禁 %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "发现一个程序错误"
 
-#: ../src/gtkexcepthook.py:52
+#: ../src/gtkexcepthook.py:42
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr "它可能不是致命的，但仍应该提交给开发者。"
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "报告错误(_R)"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "细节"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:154 ../src/gtkgui_helpers.py:169
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:284
 msgid "Error reading file:"
 msgstr "读文件错误："
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:287
 msgid "Error parsing file:"
 msgstr "分析文件错误："
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:325
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "不能写入到 %s 。会话管理支持功能未启用"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:720
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:721
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:730
 #, fuzzy
 msgid "Save Image as..."
 msgstr "另存为..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:60
 msgid "Cannot find history logs database"
 msgstr "无法找到历史记录数据库"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:103
 msgid "Contacts"
 msgstr "联系人"
 
 #. holds time
-#: ../src/history_manager.py:117 ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_window.py:86
 msgid "Date"
 msgstr "日期"
 
 #. holds nickname
-#: ../src/history_manager.py:123 ../src/history_manager.py:175
+#: ../src/history_manager.py:122 ../src/history_manager.py:174
 msgid "Nickname"
 msgstr "昵称"
 
 #. holds message
-#: ../src/history_manager.py:131 ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "消息"
 
 #. holds subject
-#: ../src/history_manager.py:138 ../src/history_manager.py:169
+#: ../src/history_manager.py:137 ../src/history_manager.py:168
 msgid "Subject"
 msgstr "主题"
 
-#: ../src/history_manager.py:183
+#: ../src/history_manager.py:182
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "您确定要清除数据库？（强烈建议 GAJIM 运行时不要进行此操作）"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:184
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4083,129 +4472,169 @@ msgstr ""
 "\n"
 "如果您点击“是”，请等待..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:396
 msgid "Exporting History Logs..."
 msgstr "输出历史记录..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:472
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 时说： %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "谁"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:510
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "您确定要删除所选定联系人的历史记录？"
 
-#: ../src/history_manager.py:509 ../src/history_manager.py:545
+#: ../src/history_manager.py:514 ../src/history_manager.py:550
 msgid "This is an irreversible operation."
 msgstr "该操作是不可撤消的。"
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:547
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您确定要删除所选定的消息？"
 
-#: ../src/history_window.py:102 ../src/history_window.py:104
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "与 %s 的聊天历史"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:261
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "现在状态：%(status)s：%(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "现在状态： %(status)s "
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:271
 msgid "Messages"
 msgstr "消息"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:272
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:196
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 的状态是 %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上线了"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 离开了"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr " %(nickname)s 发来的新消息"
 
-#: ../src/notify.py:150
-#, python-format
-msgid "New Private Message from room %s"
+#: ../src/notify.py:234
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
 msgstr "来自房间 %s 的新个人消息"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s： %(message)s"
 
-#: ../src/notify.py:157
+#: ../src/notify.py:241
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "来自 %(nickname)s 的新消息"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:75 ../src/profile_window.py:383
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:110 ../src/profile_window.py:210
+#: ../src/profile_window.py:219 ../src/profile_window.py:377
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:140
+msgid "Could not load image"
+msgstr "无法读取图片"
+
+#: ../src/profile_window.py:245
+#, fuzzy
+msgid "Information received"
+msgstr "收到邀请"
+
+#: ../src/profile_window.py:315
+msgid "Without a connection you can not publish your contact information."
+msgstr "无法脱机发布个人信息。"
+
+#: ../src/profile_window.py:327
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:335
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:354
+msgid "vCard publication failed"
+msgstr "vCard 发布失败"
+
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr "发布您的个人信息时发生错误，请稍后重试。"
+
+#: ../src/profile_window.py:381
+msgid "Without a connection, you can not get your contact information."
+msgstr "无法脱机获取个人信息。"
+
+#: ../src/roster_window.py:144 ../src/roster_window.py:196
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:306 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "旁观者"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "房间“%s”已在您的书签中。"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:603 ../src/roster_window.py:2837
 msgid "You cannot join a room while you are invisible"
 msgstr "隐身时无法加入房间。"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:804
 #, python-format
 msgid "to %s account"
 msgstr "至帐户 %s"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:809
 #, python-format
 msgid "using %s account"
 msgstr "使用账户 %s"
@@ -4213,305 +4642,319 @@ msgstr "使用账户 %s"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:815 ../src/systray.py:181 ../src/systray.py:186
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:881
 #, python-format
 msgid "of account %s"
 msgstr "帐户 %s 的"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:901
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "书签管理..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:930
 #, python-format
 msgid "for account %s"
 msgstr "为帐户 %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:951
 msgid "History Manager"
 msgstr "历史管理器"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "加入新房间(_J)"
+#: ../src/roster_window.py:960
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "加入群聊"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
+#: ../src/roster_window.py:3027
+msgid "You have unread messages"
+msgstr "您有未读消息"
+
+#: ../src/roster_window.py:1259
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "移除帐号前请阅读所有未决事件。"
+
+#: ../src/roster_window.py:1262
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理“%s”将被移除"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1263
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr "您将无法从此代理收发消息。"
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1265
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "代理“%s”将被移除"
+
+#: ../src/roster_window.py:1270
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr "您将无法从此代理收发消息。"
+
+#: ../src/roster_window.py:1314
 msgid "Assign OpenPGP Key"
 msgstr "指定您的 OpenPGP 钥匙"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1315
 msgid "Select a key to apply to the contact"
 msgstr "选择一个键应用于联系人。"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#, fuzzy
+msgid "_New room"
+msgstr "新房间"
+
+#: ../src/roster_window.py:1624
 msgid "I would like to add you to my roster"
 msgstr "我想加您为好友"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1800
 msgid "Re_name"
 msgstr "重命名(_N)"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1830
 msgid "_Log on"
 msgstr "登入(_L)"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1840
 msgid "Log _off"
 msgstr "退出登录(_O)"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2080
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2081
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在“%s”将知道您的状态。"
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2105
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2106
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
 
-#: ../src/roster_window.py:1658
+#: ../src/roster_window.py:2117
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2118
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "“%s” 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2325
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2329
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr "移除此联系人的同时将移除认证，导致他/她将一直看到您为离线。"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2333
 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:1831
+#: ../src/roster_window.py:2334
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
-#: ../src/roster_window.py:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2338
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "联系人“%s”将从您的名单中移除"
+
+#: ../src/roster_window.py:2342
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr "移除此联系人的同时将移除认证，导致他/她将一直看到您为离线。"
+
+#: ../src/roster_window.py:2411
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2412
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "为账户 %s 输入 GPG 密文字段"
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2417
 msgid "Save passphrase"
 msgstr "保存密文"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2425
 msgid "Wrong Passphrase"
 msgstr "错误字段"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2426
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "请重新输入您的 GPG 字段或点“取消”"
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
 msgid "You are participating in one or more group chats"
 msgstr "您在一或多个群聊中"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
 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:1980
+#: ../src/roster_window.py:2495
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2496
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:2452 ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "您有未读消息"
+#: ../src/roster_window.py:2591
+#, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
+msgstr ""
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr "启用历史后才能再次重读消息"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3848
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "将 %s 放在群 %s 中"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3855
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "创建 %s 和 %s 元联系人"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4041
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:141
 msgid "_Change Status Message..."
 msgstr "更改状态消息_(C)..."
 
-#: ../src/systray.py:231
-msgid "Hide this menu"
-msgstr "隐藏本菜单"
-
-#: ../src/systraywin32.py:261 ../src/systraywin32.py:280
-#, python-format
-msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread messages"
-msgstr[0] "Gajim - %d 条未读消息 "
-
-#: ../src/tooltips.py:326
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d 条未读消息 "
-
-#: ../src/tooltips.py:332
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d 条未读消息"
-
-#: ../src/tooltips.py:338
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d 条未读群聊消息"
-
-#: ../src/tooltips.py:344
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d 未读私人消息"
-
-#: ../src/tooltips.py:359 ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
+#: ../src/tooltips.py:316
 msgid "Role: "
 msgstr "角色："
 
-#: ../src/tooltips.py:396
+#: ../src/tooltips.py:317
 msgid "Affiliation: "
 msgstr "会籍："
 
-#: ../src/tooltips.py:398 ../src/tooltips.py:537
+#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
 msgid "Resource: "
 msgstr "资源："
 
-#: ../src/tooltips.py:407 ../src/tooltips.py:540 ../src/tooltips.py:565
-#: ../src/tooltips.py:676
-msgid "Status: "
-msgstr "状态"
+#: ../src/tooltips.py:323
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this room"
+msgstr ""
 
-#: ../src/tooltips.py:514
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:425 ../src/tooltips.py:526
 msgid "Subscription: "
 msgstr "认证："
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:434 ../src/tooltips.py:536
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
+#: ../src/tooltips.py:453 ../src/tooltips.py:637
+msgid "Status: "
+msgstr "状态"
+
+#: ../src/tooltips.py:484
+#, fuzzy, python-format
+msgid "Last status: %s"
 msgstr " %s 的最后状态"
 
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
+#: ../src/tooltips.py:486
+#, fuzzy, python-format
+msgid " since %s"
 msgstr "自 %s"
 
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:516
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID"
+
+#: ../src/tooltips.py:593
 msgid "Download"
 msgstr "下载"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:599
 msgid "Upload"
 msgstr "上传"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:606
 msgid "Type: "
 msgstr "类型"
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:612
 msgid "Transferred: "
 msgstr "已传输："
 
-#: ../src/tooltips.py:654 ../src/tooltips.py:675
+#: ../src/tooltips.py:615 ../src/tooltips.py:636
 msgid "Not started"
 msgstr "未开始"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:619
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:660 ../src/tooltips.py:663
+#: ../src/tooltips.py:621 ../src/tooltips.py:624
 msgid "Completed"
 msgstr "已完成"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:632
 msgid "Stalled"
 msgstr "已冻结"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:634
 msgid "Transferring"
 msgstr "传输中"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:666
 msgid "This service has not yet responded with detailed information"
 msgstr "服务无详细信息应答"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:669
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4519,68 +4962,56 @@ msgstr ""
 "此服务无法返回详细信息。\n"
 "它可能是继承或损坏的"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "无法读取图片"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:204
 msgid "?Client:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:206
 msgid "?OS:Unknown"
 msgstr "?OS: 未知"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:227 ../src/vcard.py:427
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:257
+#, fuzzy
+msgid "Affiliation:"
+msgstr "会籍："
+
+#: ../src/vcard.py:265
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣，但您不关心他/她的状态"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:267
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您对此联系人的状态信息感兴趣，但他/她不关心您的状态"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:269
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:338
+#: ../src/vcard.py:271
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:279
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:359 ../src/vcard.py:382
+#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
-#: ../src/vcard.py:458
-msgid "Without a connection you can not publish your contact information."
-msgstr "无法脱机发布个人信息。"
-
-#: ../src/vcard.py:491
-msgid "Without a connection, you can not get your contact information."
-msgstr "无法脱机获取个人信息。"
-
-#: ../src/vcard.py:495
-msgid "Personal details"
-msgstr "个人明细"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:26
 msgid "creating logs database"
 msgstr "建立日志数据库"
 
@@ -4605,109 +5036,106 @@ msgstr "%s 应为文件但它是一个目录"
 msgid "creating %s directory"
 msgstr "正在建立 %s 目录"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (aka python-pysqlite2) 匹配缺失。正在退出..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "服务不可用：Gajim不在运行，或远程控制错误"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus 在此机器上不可用或 Python 模块缺失"
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"会话进程不可用。\n"
-"您可以参考 http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:54
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "使用 D-Bus 和通知进程显示通知"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:59
 msgid "Time in minutes, after which your status changes to away."
 msgstr "转换状态为“离开”之前的时间(分钟)。"
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:60
 msgid "Away as a result of being idle"
 msgstr "发呆导致的离开"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "转换状态为“不可用”之前的时间(分钟)"
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Not available as a result of being idle"
 msgstr "发呆导致的不可用"
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:81
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:86
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:88
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
-"Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
-"precise clock, 4 the less precise one."
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "如可能对 * / _ 格式化字串。"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果为真，不要移除 */_。所以 *abc* 将被加粗但 * * 不会被移除"
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:106
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
-"chat"
+"chat."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:107
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat"
+"used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:140
 msgid "Add * and [n] in roster title?"
 msgstr "加入 * 和 [n] 在名单标题？"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr "聊天标签/窗口被重新打开时显示的历史谈话行数"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "距上次谈话结束的分钟数"
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:143
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "用 Ctrl+回车 发行消息，回车开始新行(紫茉莉 ICQ 客户端默认操作)。"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:145
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ctrl+上箭头 存储行数。"
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:148
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4715,62 +5143,62 @@ msgid ""
 msgstr ""
 "自定义地址 %s 在 %s 是单词/短语时，或 'WIKTIONARY' 意味着使用 wiktionary。"
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:151
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果选中，Gajim 可以接受 gajim-remote 远程控制。"
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
-"every x minutes"
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:155
 msgid "Ask before closing a group chat tab/window."
 msgstr "关闭群聊标签/窗口前询问。"
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "关闭群聊标签/窗口前总是询问。"
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:157
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "关闭群聊标签/窗口前不再询问。"
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 msgstr "为防止地址翻译转发，忽略用以发起文件传输的主机"
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:162
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 标准规定 KiB = 1024 字节，KB = 1000 字节。"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:170
 msgid "Show tab when only one conversation?"
 msgstr "只有一个会话时显示标签？"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:171
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "一个会话时显示标签边框？"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:172
 msgid "Show close button in tab?"
 msgstr "在标签上显示关闭键？"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr "多用户聊天中，系统会高亮显示用分号隔开的发言列表"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4778,11 +5206,11 @@ msgstr ""
 "如选是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标"
 "时才会生效。"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "如选是， Gajim 会在每次启动时为 xmpp:// 注册。"
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4790,40 +5218,50 @@ msgstr ""
 "如选是， Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题，该图标可能"
 "是动态的。"
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window"
+"contact under the contact name in roster window."
 msgstr ""
 "如选是， Gajim 会在名单窗口中将每一个联系人的状态信息显示在它名字的下方"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:191
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 msgstr "如选是， Gajim 会为每一个缓存过久或上次未获得明细的联系人请求明细"
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr "如选否，您将无法看见与您聊天的联系人变更其状态和状态消息。"
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:193
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"room"
+"room."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:197
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:198
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:199
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4832,16 +5270,18 @@ msgstr ""
 "如选是并且 GTK+ 和 PyGTK 版本高于2.8，当有未决事件时窗口将会闪动(大部分窗口管"
 "理器的默认响应)"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
-"Turn this option to False to stop sending sha info in groupchat presences"
+"Turn this option to False to stop sending sha info in group chat presences."
 msgstr ""
 "有人加入被密码保护的房间时，Jabberd1.4 不需要 sha 信息。将此选项置为“否”以停"
 "止在群聊中发送 sha 信息"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:204
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4849,7 +5289,7 @@ msgid ""
 "'peracct' - Messages for each account are sent to a specific window.\n"
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window. Note, changing this option requires restarting Gajim before "
-"the changes will take effect"
+"the changes will take effect."
 msgstr ""
 "选择新消息在窗口中的位置。\n"
 "'总是' - 所有消息都发送到一个窗口。\n"
@@ -4858,52 +5298,67 @@ msgstr ""
 "'每种类型' - 每种类型的消息 (例如, 单独聊天 及 群聊) 都发送到一个单独的窗口。"
 "注意，改变该选项后必须重启 Gajim 使设置生效"
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:205
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "如选否，您将不会在窗口中看到明细"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:206
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "如选是，请按 escape 键关闭标签/窗口"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "在群聊窗口中隐藏按钮"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:208
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "在双人聊天窗口中隐藏按钮"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Hides the banner in a group chat window"
 msgstr "在群聊窗口中隐藏标语"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Hides the banner in two persons chat window"
 msgstr "在双人聊天窗口中隐藏标语"
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "Hides the room occupants list in group chat window."
 msgstr "在群聊窗口中隐藏房主列表"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
+#: ../src/common/config.py:212
+msgid "Merge consecutive nickname in chat window."
 msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:213
+msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
+#: ../src/common/config.py:214
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+
+#: ../src/common/config.py:215
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:226
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:255
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 工作区"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:259
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4911,66 +5366,113 @@ msgstr ""
 "如果选定， Gajim 将会使把您当前的 IP 和代理服务器设置用于文件传输代理服务器设"
 "置(_P)"
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:317
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP 在本机不可用"
+
+#: ../src/common/config.py:318 ../src/common/config.py:321
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:327
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:328
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:329 ../src/common/config.py:331
+#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:342
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back soon"
 msgstr "马上回来"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:343
 msgid "Back in some minutes."
 msgstr "很快回来"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "Eating"
 msgstr "吃饭"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:344
 msgid "I'm eating, so leave me a message."
 msgstr "正在吃饭，请留言"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "Movie"
 msgstr "电影"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:345
 msgid "I'm watching a movie."
 msgstr "正在看电影"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:346
 msgid "I'm working."
 msgstr "工作中"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "Phone"
 msgstr "电话"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:347
 msgid "I'm on the phone."
 msgstr "我在打电话"
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:348
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:348
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:352
+#, fuzzy
+msgid "I'm available."
+msgstr "在线"
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "自由聊天"
+
+#: ../src/common/config.py:355
+#, fuzzy
+msgid "I'm not available."
+msgstr "不可用"
+
+#: ../src/common/config.py:356
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:357 ../src/common/config.py:358
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 "当收到的 MUC (多用户会议) 消息包含 “MUC 高亮单词”或您的昵称时播放的声音。"
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4978,96 +5480,207 @@ msgstr ""
 "MUC （多用户会议）消息到达时播放的声音。(此设置只在“提示所有 MUC 消息”为真的"
 "时候对生效)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:376 ../src/common/optparser.py:191
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:380 ../src/common/optparser.py:177
 msgid "grocery"
 msgstr "杂货店"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:384
 msgid "human"
 msgstr "人类"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:388
 msgid "marine"
 msgstr "海洋"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "无法加入房间"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#, fuzzy
+msgid "Wrong host"
+msgstr "错误字段"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:590
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "代理 %s 所需的注册信息未按时抵达"
+
+#: ../src/common/connection_handlers.py:1449
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "昵称未找到： %s "
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1511
+#: ../src/common/connection_handlers.py:1514
+#: ../src/common/connection_handlers.py:1517
+#: ../src/common/connection_handlers.py:1520
+#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1526
+#: ../src/common/connection_handlers.py:1534
+msgid "Unable to join room"
+msgstr "无法加入房间"
+
+#: ../src/common/connection_handlers.py:1512
+msgid "A password is required to join this room."
+msgstr "该房间要求密码才能加入"
+
+#: ../src/common/connection_handlers.py:1515
+msgid "You are banned from this room."
+msgstr "您被该房间封禁。"
+
+#: ../src/common/connection_handlers.py:1518
+msgid "Such room does not exist."
+msgstr "不存在这样的房间"
+
+#: ../src/common/connection_handlers.py:1521
+msgid "Room creation is restricted."
+msgstr "房间创建受限。"
+
+#: ../src/common/connection_handlers.py:1524
+msgid "Your registered nickname must be used."
+msgstr "您注册的昵称已被使用"
+
+#: ../src/common/connection_handlers.py:1527
+msgid "You are not in the members list."
+msgstr "您不在成员名单中。"
+
+#: ../src/common/connection_handlers.py:1535
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"您申请的昵称正在使用或被其他人占有。\n"
+"从下列昵称中另外指定一个："
+
+#: ../src/common/connection_handlers.py:1581
+msgid "I would like to add you to my roster."
+msgstr "我申请添加您到联系人名单"
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1602
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr " %s 请求认证"
+
+#: ../src/common/connection_handlers.py:1604
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr " %s 请求解除认证"
+
+#: ../src/common/connection_handlers.py:1606
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "%s 解除了认证"
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ 的名"
+"单管理工具移除。"
+
+#: ../src/common/connection.py:162
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:163
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "您需要重新连接才能继续收发消息。"
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:175 ../src/common/connection.py:201
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr "服务代理 %s 对注册请求的响应错误"
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:200
 msgid "Invalid answer"
 msgstr "无效答案"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:388 ../src/common/connection.py:423
+#: ../src/common/connection.py:861
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:402
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "连接到服务器 %s:%s 通过 %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:424
 msgid "Check your connection or try again later"
 msgstr "检查连接并稍后重试"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:449
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "“%s”登录验证失败"
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:450
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:564
+#: ../src/common/zeroconf/connection_zeroconf.py:164
 msgid "OpenPGP passphrase was not given"
 msgstr "未获得 OpenPGP 密文"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:566
+#: ../src/common/zeroconf/connection_zeroconf.py:166
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "您将在无 OpenPGP 情况下连接到 %s。"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:606
 msgid "invisible"
 msgstr "隐身"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:607
 msgid "offline"
 msgstr "离线"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:608
 #, python-format
 msgid "I'm %s"
 msgstr "我是 %s"
 
 #. we're not english
+#. one  in locale and one en
 #: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[本条消息已加密]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:748
+#: ../src/common/zeroconf/connection_zeroconf.py:385
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5076,299 +5689,553 @@ msgstr ""
 "主题：%s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "我申请添加您到联系人名单"
+#: ../src/common/connection.py:885
+msgid "Not fetched because of invisible status"
+msgstr ""
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "本机缺少 D-Bus python 绑定"
+
+#: ../src/common/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Gajim 的 D-Bus 兼容性无法使用"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2 (aka python-pysqlite2) 匹配缺失。正在退出..."
+
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr "服务不可用：Gajim不在运行，或远程控制错误"
 
-#: ../src/common/connection_handlers.py:49
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus 在此机器上不可用或 Python 模块缺失"
+
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"会话进程不可用。\n"
+"您可以参考 http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "无法加入房间"
+msgid "one"
+msgstr "(无)"
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "代理 %s 所需的注册信息未按时抵达"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "谁"
 
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
-msgid "Unable to join room"
-msgstr "无法加入房间"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "街道："
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "该房间要求密码才能加入"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "端口："
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "您被该房间封禁。"
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "文件"
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "不存在这样的房间"
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "房间创建受限。"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "事件"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "您注册的昵称已被使用"
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "您不在成员名单中。"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "继续(_C)"
 
-#: ../src/common/connection_handlers.py:1474
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
 msgstr ""
-"您申请的昵称正在使用或被其他人占有。\n"
-"从下列昵称中另外指定一个："
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr " %s 请求认证"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "删除"
 
-#: ../src/common/connection_handlers.py:1521
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr " %s 请求解除认证"
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1523
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 #, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s 解除了认证"
+msgid "%0 o'clock"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1680
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
+msgid "ten past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
+msgid "twenty past %0"
 msgstr ""
-"JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ 的名"
-"单管理工具移除。"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
+msgid "half past %0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
+msgid "twenty to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to %1"
+msgstr "注册到 %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
+msgid "five to %1"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "%1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:62
+#, fuzzy
+msgid "Morning"
+msgstr "工作"
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "(无)"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "事件"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:66
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr "无效的用户名特征。"
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:108
 msgid "Server address required."
 msgstr "此处需要服务器地址"
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:113
 msgid "Invalid character in hostname."
 msgstr "无效的主机名特征。"
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "Invalid character in resource."
 msgstr "无效的资源特征。"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:159
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:166
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr "不可用(_N)"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "不可用"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr "自由聊天(_F)"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr "自由聊天"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr "在线(_A)"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr "在线"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "离开"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr "离线"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr "隐身(_I)"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr "?contact has status: 未知"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr "?contact has status: 有错误"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have: 无"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr "到"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr "来自"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr "双方"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription): 无"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr "认证"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role: 无"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr "访客"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr "访客"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:299
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Role: 无"
+
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "Owner"
+msgstr "拥有人(_O)"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Administrator"
+msgstr "管理员(_A)"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Member"
+msgstr "成员(_M)"
+
+#: ../src/common/helpers.py:344
 msgid "is paying attention to the conversation"
 msgstr "正在专注于聊天"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:346
 msgid "is doing something else"
 msgstr "在做其他事"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:348
 msgid "is composing a message..."
 msgstr "正在输入消息..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:351
 msgid "paused composing a message"
 msgstr "中断输入消息"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:353
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
+#: ../src/common/helpers.py:871
+#, fuzzy, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "Gajim - %d 条未读消息 "
+
+#: ../src/common/helpers.py:877
+#, fuzzy, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "Gajim - %d 条未读消息"
+
+#: ../src/common/helpers.py:883
+#, fuzzy, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "Gajim - %d 条未读群聊消息"
+
+#: ../src/common/helpers.py:889
+#, fuzzy, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d 未读私人消息"
+
+#: ../src/common/helpers.py:899 ../src/common/helpers.py:901
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
 #. we talk about a file
 #: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:177
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
 msgid "cyan"
 msgstr "青色"
 
+#: ../src/common/optparser.py:316
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "建立日志数据库"
+
+#: ../src/common/passwords.py:61
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "帐户 %s 的"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:226
+#, fuzzy
+msgid "Could not start local service"
+msgstr "无法读取图片"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "尚未连接到“%s”"
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:343
+msgid "[This message is encrypted]"
+msgstr "[本条消息已加密]"
+
+#~ msgid "_Subscribe"
+#~ msgstr "认证(_S)"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "地址"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "离开"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "下载"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "正在为 %s 添加特殊通告"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "不可用"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "删除"
+
+#~ msgid "Contact _Info"
+#~ msgstr "联系人信息(_I)"
+
+#~ msgid "Contact Information"
+#~ msgstr "联系人信息"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "无效房间或服务器名"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "未知的 D-Bus 版本： %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr " vCard 发布成功"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "您的个人信息被成功发布。"
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "正在移动日志..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "请等待日志被移动..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "加入新房间(_J)"
+
+#~ msgid "Hide this menu"
+#~ msgstr "隐藏本菜单"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d 条未读消息 "
+
+#~ msgid "Since %s"
+#~ msgstr "自 %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "自动向联系人授权"