updated po files for 0.11. strings are frozen.

21 files changed, 27565 insertions, 20497 deletions

diff --git a/po/bg.po b/po/bg.po
index 1f079b951..c0143cac5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\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"
@@ -44,22 +44,26 @@ msgid "_Discover Services..."
 msgstr "_Откриване на услуги..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "С_тая"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Промяна на акаунт..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Отваряне на пощенската програма"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Състояние"
@@ -246,16 +250,18 @@ msgid "Edit Personal Information..."
 msgstr "Редактиране на личните данни..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Общи"
 
@@ -317,17 +323,17 @@ msgid "Manage..."
 msgstr "Управление на..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
 #. None means no proxy profile selected
-#: ../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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Няма"
 
@@ -617,11 +623,11 @@ msgstr "Редактор на настройки за напреднали"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Състояние: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Отсъствам"
 
@@ -639,7 +645,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Невидим"
 
@@ -649,21 +655,25 @@ msgid "Launch a command"
 msgstr "команда"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Не съм на разположение"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Свободен за разговор"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "Изпълнение на з_вуци"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -676,16 +686,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -744,7 +751,7 @@ msgid "for "
 msgstr "Порт: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -778,7 +785,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "Добавяне към _списъка..."
 
@@ -801,7 +808,7 @@ msgstr "_Отваряне на връзката в браузър"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Започване на разговор"
 
@@ -810,7 +817,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Изпращане на _файл"
@@ -827,12 +834,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_История"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "В групата"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Настройки на стаята"
 
@@ -918,11 +930,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Цветове на подпрозорците</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Акаунт\n"
 "Група\n"
@@ -973,7 +986,7 @@ msgstr ""
 "Съобщения\n"
 "за стая"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Временно преустановен"
 
@@ -1114,14 +1127,14 @@ msgstr "Отказване"
 msgid "Invitation Received"
 msgstr "Получена покана"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
 #: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Псевдоним:"
 
@@ -1139,8 +1152,8 @@ msgstr "Скоро посетени:"
 msgid "Room:"
 msgstr "Стая:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Влизане"
 
@@ -1191,7 +1204,7 @@ msgstr "Настройки на сървъра-посредник"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Име:"
 
@@ -1207,14 +1220,14 @@ msgstr "Използване на удостоверяване"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Натиснете за вмъкване на емотикона (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Действия"
 
@@ -1315,10 +1328,12 @@ msgid "Auto _not available after:"
 msgstr "Автоматично „Не съм на _разположение“ след:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Автоматично определяне при всяко стартиране на Gajim\n"
@@ -1326,18 +1341,14 @@ msgstr ""
 "Винаги да се използват стандартните програми на KDE\n"
 "Персонални"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "П_реди псевдонима:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Разговор"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "У_ведомления при разговор:"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1349,39 +1360,58 @@ msgstr ""
 "контакт, който не е в списъка."
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Съобщение за състояние"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "Стандартен _набор икони за състояние:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показване на _аватари на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Показване на _съобщенията за състояние на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "У_ведомления при разговор:"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "Всеки 5 _минути"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Емотикони:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Събития"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim може да изпраща и получава мета-информация, свързана с разговора с "
+"даден контакт. Тук може да укажете кои състояния бихте искали да изпращате."
+
+#: ../data/glade/preferences_window.glade.h:43
 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 "
@@ -1390,13 +1420,13 @@ msgstr ""
 "Gajim може да изпраща и получава мета-информация, свързана с разговора с "
 "даден контакт. Тук може да укажете кои състояния бихте искали да изпращате."
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Автоматично ще се показват нови събития с изскачане на съотвения прозорец"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1404,7 +1434,7 @@ msgstr ""
 "Ще се появяват съобщения за уведомяване чрез изскачащ прозорец в долния "
 "десен ъгъл на екрана"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1412,7 +1442,7 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "свързване на контакти"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1420,25 +1450,25 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "изключване на контакти"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Само ще се променя иконата на контакта, от който идва новото събитие"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr ""
 "Ако е избрано, Gajim ще изобразява аватари на контакти в списъка и стаите"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1446,7 +1476,7 @@ msgstr ""
 "Ако е избрано, съобщенията за състояние на контактите ще се показват под "
 "имената им в списъка и в стаите"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1454,7 +1484,7 @@ msgstr ""
 "Ако тази опция е избрана, ще се запомнят размерите и позициите на списъка и "
 "прозореца за разговор на екрана за следващото стартиране на програмата."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1464,7 +1494,7 @@ msgstr ""
 "състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
 "състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1472,11 +1502,15 @@ msgstr ""
 "Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
 "съответните анимирани или статични емотикони."
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "_Управление..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1488,86 +1522,97 @@ msgstr ""
 "Според акаунта\n"
 "Според типа"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Уведомяване за контакти при: "
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Уведомяване при нова _Gmail поща"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "На _всяко съобщение"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "_Един прозорец за разговори:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "У_ведомления при разговор:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Изпълнение на з_вуци"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Изписване на времето:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Запазване на _положението и размера на списъка с контакти и прозорците за "
 "разговор"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Показване само в спис_ъка"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "_Свързване"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "Изкл_ючване"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Състояние"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Автоматично съобщение за състояние при „Отсъствам“"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Автоматично съобщение за състояние при „Не съм на разположение“"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Използване на набор и_кони на транспортите"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Икона в областта за уведомяване"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1579,96 +1624,102 @@ msgstr ""
 "събития за нови съобщения възникват само ако са нови съобщения от контакт, с "
 "който не говорите в момента."
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "При получаване на ново събитие"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Редактор на настройки за напреднали"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_След времето:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "_Преди времето:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "Интернет _браузър:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Файлов мениджър:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Шрифт:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Осветяване на неправилно изписаните думи"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "В_ходящо съобщение:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Пощенска програма:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Никога"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Уведомяване"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Отваряне..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "_Изходящо съобщение:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "Пле_йър:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Показване"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "Възстановяване на стандартните _цветове"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "Подре_ждане на контактите по състояние"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "С_ъобщение за състояние:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_Адрес-УРЛ:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "минути"
 
@@ -1699,7 +1750,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "С_вързване при стартиране"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1717,7 +1768,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Сървър:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "Списък с изритани"
@@ -1786,116 +1837,116 @@ msgid "City:"
 msgstr "Град:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Фирма:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Държава:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Отдел:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Допълнителен адрес:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: гггг-мм-дд"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Собствено:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Страница в Интернет:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Бащино:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Още"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Лични данни"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Телефон:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Длъжност:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Пощенски код:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Обръщение:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Роля:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Щат:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Улица:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Наставка:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Работа"
 
@@ -1936,47 +1987,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Редактиране на _групи"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Изпращане на _еднократно съобщение"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Започване на _разговор"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Позволение за виждане на състоянието ми"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Забрана за виждане на състоянието ми"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Премахване от списъка"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Преименуване"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Записване"
 
@@ -2022,8 +2080,8 @@ msgstr "_Ръководства"
 msgid "_Discover Services"
 msgstr "_Откриване на услуги"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Редактиране"
 
@@ -2113,35 +2171,41 @@ msgid "_Send & Close"
 msgstr "Изпра_щане и затваряне"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Упълномощаване"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Упълномощаване на контакта, така че да знае кога сте свързани"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Искане за записване"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Упълномощаване"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Отказване"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Формат WAV"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Показване на всички _чакащи събития"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Показване на спис_ъка"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "С_ъстояние"
 
@@ -2154,38 +2218,43 @@ msgstr "Питане за:"
 msgid "Client:"
 msgstr "Клиент:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Коментар: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Контакти"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Състояние:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Записване:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Запазване на разговорите"
@@ -2379,7 +2448,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2408,49 +2477,49 @@ msgstr "В момента няма връзка"
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/chat_control.py:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не предлага OpenPGP ключ и не сте задавали такъв"
 
-#: ../src/chat_control.py:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Криптирането е включено"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Криптирането е изключено"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "не е в списъка"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2458,273 +2527,278 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Изключени"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Всеки %s _минути"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "В момента няма връзка"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Първо получено съобщение"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Следващо получено съобщение"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Включване на контакт"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Изключване на контакт"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Изпратено съобщение"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Осветено съобщение в стая"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Получена покана"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Непрочетени събития"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "За да смените името на акаунта, трябва да прочетете всички чакащи събития."
 
-#: ../src/config.py:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Името на акаунта вече се използва"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде под формата на „user@server“"
 
-#: ../src/config.py:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт"
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Сега се връщам."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Свързване наново сега?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
 "наново."
 
-#: ../src/config.py:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../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
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:1570 ../src/config.py:3326
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Избор на OpenPGP ключ"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия OpenPGP ключ"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Сървър"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Нямате активен акаунт"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Името на акаунта вече се използва"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Списък с изритани"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Списък с членове"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Списък със собственици"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Списък с администратори"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Изритване..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2732,11 +2806,11 @@ msgstr ""
 "<b>Кого искате да изритате?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Добавяне на член..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2744,11 +2818,11 @@ msgstr ""
 "<b>Кого искате да направите член?</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Добавяне на собственик..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2756,11 +2830,11 @@ msgstr ""
 "<b>Кого искате да направите собственик?</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Добавяне на администратор..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2768,7 +2842,7 @@ msgstr ""
 "<b>Кого искате да направите администратор?</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2784,88 +2858,98 @@ msgstr ""
 "4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
 "домейн/ресурс или адрес, съдържащ поддомейн."
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт %s"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Изтриване"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Изписване на времето:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Стая"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
-#: ../src/config.py:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Трябва да въведете парола за новия акаунт."
 
-#: ../src/config.py:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
-#: ../src/config.py:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Дублиран Jabber ID"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Този акаунт вече е конфигуриран в Gajim."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2873,23 +2957,23 @@ msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Новият акаунт беше създаден успешно"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2897,197 +2981,197 @@ msgstr ""
 "Текстът под този ред е последното, което е казано откакто за последен път "
 "сте обърнали внимание на тази стая"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Действия за „%s“"
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в URL за търсене"
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "Преди %i дни"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Име на контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "В групата"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "Номер на ключ"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Име на контакта"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Съобщение за състояние"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Запазване като настроено съобщение за състояние"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Напишете име за това съобщение за състояние"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Адрес:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Адрес:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Допълнителен адрес:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:459
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Транспорти"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Невалиден идентификатор"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Контактът вече е в списъка"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Контактът вече съществува в списъка."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber клиент"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Стари разработчици:"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Стари разработчици:"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@doganov.org>\n"
@@ -3096,61 +3180,70 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr ""
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Искане за записване за акаунт „%s“ от %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая с акаунт „%s“"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Името на стаята или сървъра съдържат непозволени символи."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Скрива лентата в прозореца на стаята"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3160,258 +3253,268 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Ново съобщение"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Ново лично съобщение"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Нова е-поща"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Покана за раговор в стая"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Изключи се контакт"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "XML конзола"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Описание: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Формат на реда</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Формат на реда</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Лични разговори"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Невалидно потребителско име"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Трябва да въведете парола за новия акаунт."
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s ви покани в стая %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когато %s стане:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавяне на специално уведомление за %s"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Свързване"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Други"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Конференции"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Услугата не може да бъде намерена"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3419,51 +3522,69 @@ msgstr ""
 "Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
 "отново."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Услугата не е достъпна"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 msgid "This type of service does not contain any items to browse."
 msgstr "Този вид услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Търсене в %s от акаунт „%s“"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Търсене"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Сканиране на %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Потребители"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Описание"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Записване"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Записване"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Записване"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Файл:"
@@ -3489,7 +3610,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Вие"
 
@@ -3499,7 +3620,7 @@ msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Получател: "
 
@@ -3566,31 +3687,31 @@ msgstr "Описание: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s иска да ви изпрати файл:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Този файл вече съществува"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Какво искате да направите?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3626,12 +3747,11 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Изпращач: "
 
@@ -3639,31 +3759,31 @@ msgstr "Изпращач: "
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Необходим е X сървър. Спиране на програмата..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim изисква PyGTK 2.6 или по-нова версия"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim изисква PyGTK 2.6 или по-нова версия. Спиране на програмата..."
 
-#: ../src/gajim.py:55
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim изисква GTK 2.6 или по-нова версия"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim изисква GTK 2.6 или по-нова версия. Спиране на програмата..."
 
-#: ../src/gajim.py:61
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Липсва поддръжка на libglade за GTK+ runtime"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3672,23 +3792,23 @@ msgstr ""
 "Премахнете текущата версия на GTK+ runtime и инсталирайте последната "
 "стабилна от %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Уверете се, че версиите на GTK+ и PyGTK на системата ви имат поддръжка за "
 "libglade."
 
-#: ../src/gajim.py:70
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim изисква PySQLite2"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim изисква PySQLite2"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3696,86 +3816,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) упълномощаване за „%s“ (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Свързване"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "грешка при изпращане на %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: ../src/gajim.py:703
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Винаги ще го виждате като изключен."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Не може да бъде установен контакт с „%s“"
 
-#: ../src/gajim.py:748 ../src/common/connection.py:389
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s вече е %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ново писмо за %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3785,56 +3905,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получихте %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1294
+#: ../src/gajim.py:1366
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: ../src/gajim.py:1307
+#: ../src/gajim.py:1379
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1383
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: ../src/gajim.py:1413
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "В момента няма връзка"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Липсва поддръжка за управление на сесиите (модул gnome.ui)"
 
@@ -3857,7 +3982,8 @@ msgid "Shows or hides the roster window"
 msgstr "Показва или скрива списъка"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Показване на следващото непрочетено съобщение в изскачащ прозорец"
 
 #: ../src/gajim-remote.py:82
@@ -4192,8 +4318,8 @@ msgstr "Неуспех при изпращането на лично съобщ�
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Вече не сте в стая „%s“ или „%s“ е напуснал(а)."
 
 #: ../src/groupchat_control.py:141
@@ -4210,99 +4336,100 @@ msgid "Insert Nickname"
 msgstr "Смяна на псе_вдоним"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s вече е познат като %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "В групата"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s сега е %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Псевдонимът не е намерен: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Няма тема за тази стая"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "„%s“ изглежда не е валиден JID"
 
-#: ../src/groupchat_control.py:1181
+#: ../src/groupchat_control.py:1185
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Няма такава команда: /%s (ако искате да изпратите това, сложете представка /"
 "say)"
 
-#: ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Команди: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Употреба: /%s <псевдоним|JID> [причина], отлъчва контакта от стаята. "
 "Псевдонимът може да се замества, но не и ако съдържа „@“. Ако контактът е в "
 "стаята, той също ще бъде изритан. Не се поддържат интервали в псевдонима."
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4310,12 +4437,12 @@ msgstr ""
 "Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
 "контакт."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Употреба: /%s, изчиства текстовия прозорец."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4324,21 +4451,21 @@ msgstr ""
 "Употреба: /%s [причина], затваря текущия прозорец или подпрозорец и показва "
 "причина, ако е указана."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Употреба: /%s, скрива бутоните за раговор."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Употреба: /%s <JID> [причина], кани JID в текущата стая, причината е по "
 "избор."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4347,27 +4474,27 @@ msgstr ""
 "Употреба: /%s <стая>@<сървър>[/псевдоним], предлага влизане в стая@сървър, "
 "използването на указания псевдоним е по избор."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 msgstr ""
 "Употреба: /%s <псевдоним> [причина], премахва указания с псевдоним участник "
 "от стаята и евентуално показва причина. Не се поддържат интервали в "
 "псевдонима."
 
-#: ../src/groupchat_control.py:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
 "трето лице (т.е. „/%s експлодира“)."
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4376,22 +4503,22 @@ msgstr ""
 "Употреба: /%s <псевдоним> [съобщение], отваря прозорец за лично съобщение и "
 "изпраща съобщение до участника, указан с псевдонима."
 
-#: ../src/groupchat_control.py:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Употреба: /%s [тема], показва или актуализира темата на текущата стая."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Употреба: /%s [тема], показва или актуализира темата на текущата стая."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4399,69 +4526,71 @@ msgstr ""
 "Употреба: /%s <съобщение>, изпраща съобщение без да се имат предвид други "
 "команди."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Няма помощна информация за /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Да _не се задава този въпрос отново"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Отметката вече е установена"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Стаята „%s“ вече присъства в отметките."
 
-#: ../src/groupchat_control.py:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Може да организирате отметките чрез менюто „Действия“."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Изритване на %s"
@@ -4491,68 +4620,68 @@ msgstr "Подробности"
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 msgid "Error parsing file:"
 msgstr "Грешка при анализиране на файл:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:325
+#: ../src/gtkgui_helpers.py:334
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Неуспех при запис на %s. Поддръжката за управление на сесиите няма да работи"
 
-#: ../src/gtkgui_helpers.py:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Запазване на файла като..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Неуспех при откриването на базата от данни за разговорите"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Контакти"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Съобщение"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Тема"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4560,7 +4689,7 @@ msgstr ""
 "Искате ли да изчистите базата от данни? (ИЗОБЩО НЕ СЕ ПРЕПОРЪЧВА, АКО GAJIM "
 "Е СТАРТИРАН)"
 
-#: ../src/history_manager.py:184
+#: ../src/history_manager.py:188
 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 "
@@ -4574,26 +4703,26 @@ msgstr ""
 "\n"
 "В случай, че изберете „Да“, изчакайте..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Изнасяне на записите на разговорите..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s в %(time)s каза: %(message)s\n"
 
-#: ../src/history_manager.py:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Това е необратима операция."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Наистина ли искате да изтриете избраното съобщение?"
@@ -4624,11 +4753,11 @@ msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Съобщения"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4668,132 +4797,133 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Ново съобщение от %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Неуспех при зареждането на изображението"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Получена покана"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 msgid "Without a connection you can not publish your contact information."
 msgstr "Трябва да сте свързани, за да публикувате визитката."
 
-#: ../src/profile_window.py:327
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 msgid "Without a connection, you can not get your contact information."
 msgstr "Трябва да сте свързани, за да изтеглите визитката"
 
-#: ../src/roster_window.py:144 ../src/roster_window.py:196
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../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"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Не може да влезете в стая, докато сте невидими."
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "от акаунт „%s“"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "към акаунт „%s“"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "за акаунт „%s“"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Управление на отметките..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Мениджър на историята"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Влизане в стая"
 
-#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
-#: ../src/roster_window.py:3027
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
 
-#: ../src/roster_window.py:1262
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4801,12 +4931,12 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4815,74 +4945,123 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Контакти"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Въведете парола за GPG ключ за акаунт „%s“."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Преименуване"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Въведете парола за GPG ключ за акаунт „%s“."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Премахване"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Премахване на контакт от списъка"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Нова стая"
+msgid "_New group chat"
+msgstr "Стая"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr ""
 "Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "_Изпращане на съобщение от сървъра"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Пре_именуване"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+msgid "To all online users"
+msgstr ""
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "С_вързване"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "Изкл_ючване"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4890,7 +5069,7 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4898,17 +5077,17 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4917,32 +5096,32 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:2411
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Въведете парола за GPG ключ за акаунт „%s“."
 
-#: ../src/roster_window.py:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Запазване на паролата"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Грешна парола"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4950,21 +5129,21 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: ../src/roster_window.py:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Jabber акаунт."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4972,111 +5151,135 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята."
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"За да разговаряте с други контакти, първо трябва да създадете Jabber акаунт."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Преместване на %s в група %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Създаване на %s и %s като мета-контакти"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Промяна на съобщението за състояние..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Роля: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Скрива това меню"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Връзка: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Състояние: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Последно състояние на %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "от %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Записване: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
+
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Изтегляне"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Качване"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Прехвърлени: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Не е започнал"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Преустановен"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Завършил"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Блокирал"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Прехвърляне"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Тази услуга все още не е отговорила с подробна информация"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5084,25 +5287,25 @@ msgstr ""
 "Тази услуга не можа да отговори с подробна информация.\n"
 "Най-вероятно е остаряла или повредена"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "от %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Връзка: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5110,7 +5313,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5118,13 +5321,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
 #. None
-#: ../src/vcard.py:271
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5132,123 +5335,123 @@ msgstr ""
 "Вие не се интересувате от информацията за състоянието на контакта, както и "
 "той от вашата"
 
-#: ../src/vcard.py:279
+#: ../src/vcard.py:299
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "създаване на база от данни за разговорите"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s e файл, а би трябвало да е папка"
 
-#: ../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:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Спиране на програмата"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s e папка, а би трябвало да е файл"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "създаване на папка %s"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Използвайте DBus и Notification-Daemon за показване на уведомленията"
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
 
-#: ../src/common/config.py:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Автоматично състояние поради липса на активност"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Време в минути, след което състоянието да се променя на „Не съм на "
 "разположение“."
 
-#: ../src/common/config.py:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Автоматично състояние поради липса на активност"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Тълкуване на двойки от „* / _“ като възможни символи за форматиране."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ако е „True“, не се премахват */_. Така *абв* ще е в получер стил, но със "
 "символите * *."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Добавяне на * и [n] към заглавието на списъка?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5256,21 +5459,21 @@ msgstr ""
 "Колко реда от предишния разговор да за запомнят при повторното отваряне на "
 "подпрозорец/прозорец."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колко минути да отделят последните редове от предишния разговор."
 
-#: ../src/common/config.py:143
+#: ../src/common/config.py:145
 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:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5279,7 +5482,7 @@ msgstr ""
 "Или определен адрес съдържащ %s, където %s е думата/фразата, или "
 "'WIKTIONARY', което означава използване на wiktionary."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:153
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
@@ -5287,31 +5490,52 @@ msgstr ""
 
 #: ../src/common/config.py:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Винаги да се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Никога да не се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5319,32 +5543,36 @@ msgstr ""
 "Превъзмогва хоста при файлов трансфер в случай, че се ползва NAT/"
 "пренасочване на портове."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Според стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Показване на подпрозорец при един разговор?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показване на границата на подпрозореца при един разговор?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Показване на бутона за затваряне на подпрозореца?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Списък с думи, отделени с точка и запетая, които ще се осветяват при "
 "разговор в стая."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5353,11 +5581,11 @@ msgstr ""
 "администратора на прозорци. Тази настройка е валидна само ако се използва "
 "иконата в областта за уведомяване."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Ако е „True“, Gajim регистрира xmpp:// при всяко стартиране."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5365,7 +5593,7 @@ msgstr ""
 "Ако е „True“, ще се изобразява икона във всеки подпрозорец, съдържащ "
 "непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5374,7 +5602,7 @@ msgstr ""
 "Ако е „True“, ще се показва съобщението за състояние, ако има такова, на "
 "всеки контакт под името му списъка."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5382,7 +5610,7 @@ msgstr ""
 "Ако е „True“, ще се изпраща запитване за аватар до всеки контакт, който е "
 "нямал такъв последния път или пък има остарял кеширан аватар."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5391,29 +5619,37 @@ msgstr ""
 "Ако е „False“, вече няма да виждате реда за състоянието при разговорите, "
 "когато контактът променя състоянието си."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5423,18 +5659,19 @@ msgstr ""
 "ще мига (стандартното поведение при повечето администратори на прозорци) при "
 "задържане на чакащи събития."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5453,68 +5690,83 @@ msgstr ""
 "специфичен прозорец. Забележете, че промяната на тази опция изисква "
 "рестартирането на Gajim, за да влезе в сила"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ако е „False“, повече няма да виждате аватар в прозореца за разговор"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:212
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Ако е „True“, натискането на клавиша „Escape“ затваря прозореца/подпрозореца"
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Скрива бутоните в прозореца на стаята"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "Скрива бутоните в прозорец за разговор с два контакта"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Скрива лентата в прозореца на стаята"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Скрива лентата в прозорец за разговор с два контакта"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "Скрива списъка на участниците в прозореца на стаята"
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Заобикалка заради Jabberd2"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5522,151 +5774,147 @@ msgstr ""
 "Ако тази опция е избрана, ще се използва вашият IP адрес и сървърите-"
 "посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:326
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/common/config.py:318 ../src/common/config.py:321
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Спя"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, оставете съобщение."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Навън"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Наслаждавам се на живота навън"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "На линия"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Свободен за разговор"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Не съм на разположение"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "muc_higlighted_words или когато съобщение съдържа псевдонима ви."
 
-#: ../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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 msgstr ""
-"Звукът, който да се възпроизвежда, когато каквото и да е съобщение пристигне "
-"в стаята. (Тази настройка е валидна само ако notify_on_all_muc_messages е "
-"„True“)"
 
-#: ../src/common/config.py:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "колониална"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "хуманна"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "синя"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 msgid "Unable to load idle module"
 msgstr ""
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Грешна парола"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5677,169 +5925,167 @@ msgstr ""
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1449
+#: ../src/common/connection_handlers.py:1519
 #, 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 ""
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
+msgstr "Влизане в стая"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+msgid "A password is required to join this group chat."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1515
+#: ../src/common/connection_handlers.py:1585
 #, fuzzy
-msgid "You are banned from this room."
+msgid "You are banned from this group chat."
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+msgid "Such group chat does not exist."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+msgid "Group chat creation is restricted."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 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
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, fuzzy, python-format
 msgid "unsubscribe request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, 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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"За да продължите да изпращате и получавате съобщения, трябва да се свържете "
-"наново."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Транспортът „%s“ отговори погрешно на запитването за регистрация."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Невалиден отговор"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не може да се осъществи свързване с „%s“"
 
-#: ../src/common/connection.py:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Свързан към сървър %s:%s с %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Проверете връзката или опитайте отново по-късно"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "Не беше зададена парола за OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "невидим"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "изключен"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "%s"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Това съобщение е криптирано]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5848,16 +6094,16 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На този компютър няма инсталиран модул на Питон за D-Bus"
 
-#: ../src/common/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Възможностите за D-Bus не могат да бъдат използвани"
 
@@ -6047,242 +6293,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Невалиден символ в потребителското име."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Необходим е адрес на сървъра."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Невалиден символ в името на хоста."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Невалиден символ в ресурса."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Зает"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Зает"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Не съм на разположение"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Свободен за разговор"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "На _линия"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "На линия"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Свързване"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "_Отсъствам"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Изключен"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Изключен"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "Не_видим"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "Неизвестно"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "Има грешки"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "От"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Двустранно"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Записване"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "Не е установен"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Председатели"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Председател"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Участници"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Посетител"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Не е установен"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "Со_бственик"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Администратор"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Член"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "обръща внимание на разговора"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "прави нещо друго"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 msgid "is composing a message..."
 msgstr "пише съобщение..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "спря да пише съобщение"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6293,50 +6539,118 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "грешка: %s не може да бъде отворен за четене"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "синьозелена"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "създаване на база от данни за разговорите"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "за акаунт „%s“"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Не може да бъде установен контакт с отсрещната машина."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"За да продължите да изпращате и получавате съобщения, трябва да се свържете "
+"наново."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, fuzzy
 msgid "Could not start local service"
 msgstr "Неуспех при зареждането на изображението"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не може да се осъществи свързване с „%s“"
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Това съобщение е криптирано]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Записване"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "грешка при изпращане на %s ( %s )"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Нова стая"
+
+#~ msgid "Role: "
+#~ msgstr "Роля: "
+
+#~ msgid "Affiliation: "
+#~ msgstr "Връзка: "
+
+#~ 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 ""
+#~ "Звукът, който да се възпроизвежда, когато каквото и да е съобщение "
+#~ "пристигне в стаята. (Тази настройка е валидна само ако "
+#~ "notify_on_all_muc_messages е „True“)"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6358,10 +6672,6 @@ msgstr "[Това съобщение е криптирано]"
 #~ msgid "Not Available "
 #~ msgstr "Не съм на разположение"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Изтриване"
-
 #~ msgid "Contact _Info"
 #~ msgstr "_Данни за контакта"
 
@@ -6392,9 +6702,6 @@ 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 непрочетено съобщение"
diff --git a/po/br.po b/po/br.po
index 415559066..a6a5cb825 100644
--- a/po/br.po
+++ b/po/br.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -48,22 +48,26 @@ msgid "_Discover Services..."
 msgstr "_Dizoleiñ ar servijoù..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Webkaozioù"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Kemmañ ar gont..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Digeriñ ar bostelerez"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stad"
@@ -250,16 +254,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Hollek"
 
@@ -321,17 +327,17 @@ msgid "Manage..."
 msgstr "Kemmañ..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Hini ebet"
 
@@ -612,11 +618,11 @@ msgstr "Aozer kefluniañ dre ar munut"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Stad:"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Ezvezant"
 
@@ -633,7 +639,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Diwelus"
 
@@ -643,21 +649,25 @@ msgid "Launch a command"
 msgstr "urzhiad"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Dihegerz"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Prest da flapiñ"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "_Seniñ"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -670,16 +680,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -739,7 +746,7 @@ msgid "for "
 msgstr "Porzh:"
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -774,7 +781,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Ouzhpennañ er roll"
 
@@ -797,7 +804,7 @@ msgstr "_Digerién an ere er furcher web"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Kregiñ da flapiñ"
 
@@ -806,7 +813,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Kas ur _restr"
@@ -823,12 +830,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Istoradur"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "Er strollad"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Kefluniañ ar webgaoz"
 
@@ -913,11 +925,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Liv-stad an ivinelloù</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Kont\n"
 "Strollad\n"
@@ -969,7 +982,7 @@ msgstr ""
 "kaset davet\n"
 "webkaozioù"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Ehan"
 
@@ -1101,14 +1114,14 @@ msgstr "Nac'hañ"
 msgid "Invitation Received"
 msgstr "Resevet ar bedadenn"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Lesanv:"
 
@@ -1126,8 +1139,8 @@ msgstr "Nevez 'zo:"
 msgid "Room:"
 msgstr "Webgaoz:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "E_barzhiñ"
 
@@ -1178,7 +1191,7 @@ msgstr "Merañ an aeladoù proksi"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Anv:"
 
@@ -1194,14 +1207,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Oberoù"
 
@@ -1300,10 +1313,12 @@ msgid "Auto _not available after:"
 msgstr "Bezañ lakaet evel _dihegerz war-lerc'h:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Détection automatique à chaque démarrage\n"
@@ -1311,18 +1326,14 @@ msgstr ""
 "Toujours utiliser les applications par défaut de KDE\n"
 "Personnalisé"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "_A-raok al lesanv:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Flap"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "Titou_roù-stad ar flap:"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1334,39 +1345,59 @@ msgstr ""
 "messages des contacts qui ne sont pas dans votre liste"
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Titour-stad"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "_Arlunioù-stad dre-ziouer:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Diskouez titouroù-stad an darempredoù e-barzh ar roll"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Titou_roù-stad ar flap:"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "_Bep 5 munutenn"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Boulomelloù:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Darvoudoù"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim peut envoyer et recevoir des meta-informations concernant les "
+"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:43
 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 "
@@ -1376,14 +1407,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:41
+#: ../data/glade/preferences_window.glade.h:44
 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:42
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1391,7 +1422,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:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1399,7 +1430,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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1407,19 +1438,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:45
+#: ../data/glade/preferences_window.glade.h:48
 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1427,7 +1458,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:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1435,7 +1466,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:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1443,7 +1474,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1453,7 +1484,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:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1461,11 +1492,15 @@ 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:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "Me_rañ..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1477,84 +1512,95 @@ msgstr ""
 "Dre gont\n"
 "Dre zoare"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Ma c'helaouiñ evit ar c'hemennadennoù _Gmail nevez"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "Da _bep kemennadenn:"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "Ur prenestr-flapiñ:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Titou_roù-stad ar flap:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "_Seniñ"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Penndibaboù"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Diskouez an eur:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Diskouez er _roll hepken"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "_Lugañ"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "_Dilugañ"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Stad"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "_Gwiskadur:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "An emc'hemennadenn evit ar stad \"Ezvezant\""
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "An emc'hemennadenn evit ar stad \"Dihegerz\""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Implij arlunioù an _dorioù"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Implij an arlun-gelaouiñ (trayicon)"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1566,96 +1612,102 @@ 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:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Pa resever un darvoud nevez"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Aozer kefluniañ dre ar munut"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_War-lerc'h an eur:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "_A-raok an eur:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Furcher web:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "Merour _restroù:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Nodrezh:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Islinennañ ar fazioù reizhskrivañ"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "Kemennadenn o _tegouezhout:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Meziant posteliñ:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Morse"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Kelaouiñ ac'hanon"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Digeriñ..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "Kemennadenn o _vont 'maez:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Soner:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "Di_foupañ"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "_Distreiñ gant al livioù dre-ziouer"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "_Urzhiañ an darempredoù hervez o stad"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "_Titour-stad:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL :"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "munutenn"
 
@@ -1686,7 +1738,7 @@ msgstr ""
 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
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1704,7 +1756,7 @@ msgstr "ID Jabber:"
 msgid "Order:"
 msgstr "Servijer:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "Roll argas"
@@ -1773,116 +1825,116 @@ msgid "City:"
 msgstr "Kêr:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Embregerezh:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Bro:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Departamant:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Chomlec'h 2:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Anv bihan:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Lec'hienn hiniennel:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Eil anv bihan:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Muioc'h"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Titouroù hiniennel"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Pellgomz:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Plas:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Kod postel:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Rakger:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Perzh:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Stad:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Straed:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Lostger:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Labour"
 
@@ -1923,47 +1975,54 @@ msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1774
+#: ../src/roster_window.py:1996
 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"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Kas ur gemennadenn _simpl"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Kregiñ da _flapiñ"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, 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:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Difenn dezhañ/dezhi gwelet ma stad"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Dilemel diouzh ar roll"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Adenvel"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Koumanant"
 
@@ -2009,8 +2068,8 @@ msgstr "_Endalc'hadoù"
 msgid "_Discover Services"
 msgstr "_Dizoleiñ ar servijoù"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Aozañ"
 
@@ -2099,35 +2158,41 @@ msgid "_Send & Close"
 msgstr "_Kas & Serriñ"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Aotren"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Goulenn koumanantiñ"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Aotren"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Nac'hañ"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Sonioù wav"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Diskouez ar _roll-darempredoù"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "S_tad"
 
@@ -2140,38 +2205,43 @@ msgstr "Goulenn:"
 msgid "Client:"
 msgstr "Poellad:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Evezhiadenn: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Darempredoù"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "ID Jabber:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr ""
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stad:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Koumanant:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Istoradur flapiñ"
@@ -2365,7 +2435,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2388,51 +2458,51 @@ msgstr "N'eus ket tu da gevreañ"
 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:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Flapoù"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "War enaou emañ ar sifrañ"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Ket er roll"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, 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:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2440,97 +2510,102 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Dizoberiant"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Bep %s _munutenn"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Oberiant"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Darvoud"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, 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
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Kemennadenn gentañ"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Darempred luget"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Darempred diluget"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Kemennadenn gaset"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Resevet ar bedadenn"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Luget oc'h d'ar servijer"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 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:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Darvoudoù chomet dilenn"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 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:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2538,173 +2613,173 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Anv-kont direizh"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "N'hell ket anv ar gont chom goullo."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "N'hell ket anv ar gont kaout esaouennoù."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 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:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Road direizh"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Adlugañ bremañ?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 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:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Kont dihegerz"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 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:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 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:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Anv"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Servijer"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Kemmañ %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Emezelañ war %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Roll argas"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Roll an izili"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Roll ar perc'hennerien"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Roll ar verourien"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Abeg"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Lesanv"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Perzh"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Oc'h argas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2712,11 +2787,11 @@ msgstr ""
 "<b>Piv a fell deoc'h argas ?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Oc'h ouzhpennañ un ezel..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2724,11 +2799,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da ezel ?</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Oc'h ouzhpennañ ur perc'henn..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2736,11 +2811,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da berc'henn ?</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Oc'h ouzhpennañ ur v-merour-ez..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2748,7 +2823,7 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da verour-ez ?</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2765,90 +2840,100 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Lemel ar gont %s"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Dilemel"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Diskouez an eur:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Bez ez eus titouroù direizh er sined-mañ"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 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:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ger-kuzh direizh"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 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:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 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:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Eilañ an ID Jabber"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Kefluniet eo bet ar gont-mañ e-barzh Gajim dija."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2857,23 +2942,23 @@ msgstr ""
 "Araoket, pe hen ober diwezhatoc'h en ur glikañ war Kontoù er meuziad Aozañ "
 "eus ar prenestr pennañ."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2881,255 +2966,264 @@ 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:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Oberoù evit \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, 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:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "Web_klask"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "%i devezh 'zo"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Anv an darempred: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Strollad"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "Er strollad"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Anv an darempred"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "Titour-stad %s"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Enrollañ evel titour-stad rakenrollet"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Roit un anv d'an titour-stad-mañ"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Chomlec'h 2:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Dorioù"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "ID-arveriad-ez direizh"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Darempred er roll dija"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Emañ an darempred en ho roll-darempredoù dija."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "ID arveriad-ez:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "Ur flaperez jabber e GTK+"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "TRUGAREZ DA:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr ""
 "Troet e brezhoneg gant\n"
 "Giulia Fraboulet <djoulia@gmail.com>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Goulenn enskrivañ evit ar gont %s digant %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Goulenn enskrivañ digant %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Emaoc'h er webgaoz %s dija"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ebarzhiñ ur sal-flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "A guzha an nozelennoù er prenestr flapiñ"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Kregiñ da flapiñ"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3139,258 +3233,268 @@ msgstr ""
 "dezhañ:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Rankout a rit reiñ ur ger-kuzh."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Darempred luget"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Kemennadenn nevez"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Kemennadenn simpl nevez"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Kemennadenn hiniennel nevez"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Darempred diluget"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Kemennadenn simpl"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Kas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr ""
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Taolennadur: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Anv-arveriad-ez direizh"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Rankout a rit reiñ ur ger-kuzh evit enrollañ ar gont nevez."
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Dibabit ur son"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "An holl restroù"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Sonioù wav"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Dibabit ur skeudenn"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Skeudennoù"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Pa teu %s da vezañ:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Kevreadenn"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Traoù all"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Kendiviz"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 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:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Merañ servijoù ar gont %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Merañ ar servijoù"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "N'eo ket bet kavet ar servij"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3398,51 +3502,69 @@ msgstr ""
 "N'eus servij ebet er chomlec'h roet, pe ne respont ket. Gwiriekait ar "
 "chomlec'h ha klaskit en-dro."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "N'eus ket tu furchal er servij"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "O furchal e-barzh %s oc'h implij ar gont %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Furchal"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal er servij-mañ."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "_Emezelañ"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Arveridi"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Taolennadur"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Emezelañ"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Koumanantiñ"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Koumanantiñ"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Restr"
@@ -3468,7 +3590,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "C'hwi"
 
@@ -3478,7 +3600,7 @@ msgid "Sender: %s"
 msgstr "Kaser: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Resever:"
 
@@ -3545,31 +3667,31 @@ msgstr "Taolennadur: %s"
 msgid "%s wants to send you a file:"
 msgstr "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3605,12 +3727,11 @@ msgstr "Restr:"
 msgid "It is not possible to send empty files"
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Anv:"
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Kaser:"
 
@@ -3618,33 +3739,33 @@ msgstr "Kaser:"
 msgid "Pause"
 msgstr "Ehan"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Ezhomm en deus Gajim eus ur servijer X evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr ""
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3653,21 +3774,21 @@ msgstr ""
 "Dilamit al levraoueg red eus GTK+runtime ha staliit an aozadur stabil "
 "diwezhañ diwar %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 
-#: ../src/gajim.py:70
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3675,86 +3796,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Aotre HTTP (%s) evit %s (id : %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Kevreadenn"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Sujed: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Aotre degmeret"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Dilamet eo bet ho aotre digant \"%s\""
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Atav e weloc'h anezhañ ezlinenn."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s a zo bremañ %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Direizh eo ho ker-kuzh"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Postel nevez war %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3764,56 +3885,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, 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
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "N'eus ket tu da gevreañ"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
@@ -3837,7 +3963,8 @@ msgid "Shows or hides the roster window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "A zifoup ur prenestr gant ar gemennadenn dilenn da-heul"
 
 #: ../src/gajim-remote.py:82
@@ -4163,8 +4290,8 @@ msgstr "Kas ar gemennadenn brevez c'hwitet"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "N'emaoc'h ket er webgaoz \"%s\" ken, pe neuze eo aet kuit \"%s\"."
 
 #: ../src/groupchat_control.py:141
@@ -4181,99 +4308,100 @@ msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s a zo bremañ %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "Er strollad"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s a zo bremañ %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "N'eus sujed ebet gant ar webgaoz-mañ"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, 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:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Urzhioù: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Usage : /%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:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4281,12 +4409,12 @@ msgstr ""
 "Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
 "spécifié."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4295,21 +4423,21 @@ msgstr ""
 "Usage : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la "
 "raison si spécifiée."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Usage : /%s <JID> [raison], invite le JID dans le salon actuel, la raison "
 "est optionnelle."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4318,27 +4446,27 @@ msgstr ""
 "Usage : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur "
 "en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 msgstr ""
 "Usage : /%s <surnom> [raison], supprime l'occupant portant le surnom "
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_control.py:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "Usage : /%s <action>, envoie l'action au salon actuel. Utilise la troisième "
 "personne. (ex : /%s explose.)"
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4347,92 +4475,94 @@ 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:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, 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:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "N'eus skoazell hegerz ebet evit /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ha sur oc'h e fell deoc'h kuitaat ar flap \"%s\"?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Ma serrit ar prenestr-mañ, e tigevreoc'h diouzh ar flap-mañ."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Chom hep goulenn ket"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Cheñch ar sujed"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Skrivit ar sujed nevez:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Cheñch lesanv"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Sined lakaet dija"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, 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:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar sined"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
@@ -4461,67 +4591,67 @@ msgstr "Munudoù"
 msgid "Error: cannot open %s for reading"
 msgstr "Fazi: dibosupl eo digeriñ %s evit e lenn"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enrollañ ar restr dindan..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Dibosupl eo kavout titourva an istoradur"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Darempredoù"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Deiziad"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Lesanv"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Kemennadenn"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Titl"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4529,7 +4659,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:184
+#: ../src/history_manager.py:188
 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 "
@@ -4538,27 +4668,27 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Oc'h ezporzhiañ an istoradur..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, 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:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 #, fuzzy
 msgid "This is an irreversible operation."
 msgstr "Setu un ober n'eus ket tu da vont war e giz."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 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?"
@@ -4589,11 +4719,11 @@ msgstr "Ar stad a zo bremañ: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Ar stad a zo bremañ: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Kemennadennoù"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4633,46 +4763,46 @@ msgstr "%(nickname)s : %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "C'hwitet eo embannadur ar vCard"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4680,86 +4810,87 @@ msgstr ""
 "Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
 "diwezhatoc'h."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Sellerien"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "N'hellit ket ebarzhiñ ur webgaoz keit ha m'emaoc'h diwelus."
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "en ur implij ar gont %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "d'ar gont %s"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "en ur implij ar gont %s"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "eus ar gont %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Merañ ar sinedoù..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "evit ar gont %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Merour an istoradur"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, 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
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Kemennadennoù nevez ho peus"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, 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
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4767,12 +4898,12 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4781,73 +4912,123 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Darempredoù"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Adenvel"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Dilemel"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Dilemel an darempred diouzh ar roll"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Dibabit un alc'hwezh da"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Sal-flapiñ nevez"
+msgid "_New group chat"
+msgstr "Flap a-stroll"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "_Kas ur gemennadenn d'ar servijer"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "Utilisateurs En _Ligne"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Lugañ"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Dilugañ"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Kemmañ an titour-stad"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Kaset eo bet an aotre"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, 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:2325
+#: ../src/roster_window.py:2617
 #, 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:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4855,7 +5036,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:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4863,17 +5044,17 @@ 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:2334
+#: ../src/roster_window.py:2629
 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"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4882,32 +5063,32 @@ 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
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/roster_window.py:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Ger-kuzh faos"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 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:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4915,131 +5096,154 @@ 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:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 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:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Kas %s er strollad %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Strollañ %s ha %s"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Kemmañ an titour-stad..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Kemmañ an titour-stad..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Perzh:"
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Kuzhat ar meuziad-mañ"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr ""
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "ID Jabber:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP : "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Stad:"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Stad diwezhañ: %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "dibaoe %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "ID Jabber:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Koumanant:"
+
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Pellgargañ"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Kas"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Doare:"
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Treuzkaset:"
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "N'eo ket kroget"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Arsavet"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Echu"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "O treuzkas"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 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:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5047,31 +5251,31 @@ msgstr ""
 "N'eus ket bet kaset titouroù munut gant ar servij-mañ.\n"
 "Sur 'walc'h eo torr pe kamm"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "dibaoe %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 msgid "Affiliation:"
 msgstr ""
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 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:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5079,134 +5283,134 @@ msgstr ""
 "Dedennet oc'h gant bezañs an darempred-mañ, met hennezh/hounnez n'eo ket "
 "gant ho hini"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 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:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr ""
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "o krouiñ titourva an istoradur"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "ur restr eo %s met rankout a rafe bezañ ur renkell"
 
-#: ../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:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Emañ Gajim o vont da guitaat diouzhtu"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "ur renkell eo %s met rankout a rafe bezañ ur restr"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "a grou ar renkell %s"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, 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:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Ezvezant rak dizoberiant"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Dihegerz rak dizoberiant."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Implij ur re */_ evel arouezioù neuziañ an destenn."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Ouzhpennañ * hag [n] da ditl ar roll darempredoù?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5214,13 +5418,13 @@ msgstr ""
 "Niver a linennoù da vemoriñ diouzh ar gaozeadenn gent pa vez addigoret un "
 "ivinell pe ur prenestr."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5228,11 +5432,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:145
+#: ../src/common/config.py:147
 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:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5241,83 +5445,107 @@ 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:151
+#: ../src/common/config.py:153
 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:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Goulenn a-raok serriñ un ivinell pe ur prenestr."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Goulenn atav a-raok serriñ ar webgaozioù dispartiet gant un esaouenn ar roll-"
 "mañ."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Chom hep goulenn morse a-raok serriñ ar webgaozioù dispartiet gant un "
 "esaouenn er roll-mañ."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 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:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 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:187
+#: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr ""
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:192
 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:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5326,59 +5554,68 @@ 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:191
+#: ../src/common/config.py:195
 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:192
+#: ../src/common/config.py:196
 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:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5395,214 +5632,227 @@ 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:205
+#: ../src/common/config.py:211
 #, 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:206
+#: ../src/common/config.py:212
 #, 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:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "A guzha an nozelennoù er prenestroù-flapiñ"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "A guzha roll ar berzhidi en ur prenestr webgaoz"
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "O kousket"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Distro 'benn nebeut"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Distro 'vin a-benn un nebeut munutennoù.."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "O tebriñ"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "O sellout ouzh ur film 'maon."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "O labourat"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "O labourat 'maon."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Pellgomz"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Ouzh ar pellgomz emaon."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Er-maez"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Er-maez emaon o profitañ eus ar vuhez"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Hegerz"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Prest da flapiñ"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Dihegerz"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 
-#: ../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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "Glas"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "Mab-den"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "Glas-mor"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Ger-kuzh faos"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5615,49 +5865,54 @@ msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:1449
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "Un mot de passe est requis pour rejoindre ce salon."
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Vous n'êtes pas dans la liste des membres."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5666,27 +5921,27 @@ msgstr ""
 "par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, 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
+#: ../src/common/connection_handlers.py:1846
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5696,89 +5951,87 @@ msgstr ""
 "de contact. Utiliser un outil de gestion de liste de contact tel que http://"
 "jru.jabberstudio.org/ pour le supprimer"
 
-#: ../src/common/connection.py:162
-#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"Evit kenderc'hel da gas ha da resev kemennadennoù, e rankit lugañ en-dro."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Respont direizh"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Luget d'ar servijer %s:%s gant %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Gwiriekait ho lugadenn pe klaskit en-dro diwezhatoc'h"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 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:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "Diwelus"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "Ezlinenn"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "%s on"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5787,17 +6040,17 @@ msgstr ""
 "Titl : %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 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
+#: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
 msgstr ""
 
-#: ../src/common/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr ""
 
@@ -5987,242 +6240,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Arouezenn ziereizh en anv-arveriad-ez"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Chomlec'h ar servijer dre ret"
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Arouezenn zireizh en anv-ostiz."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr ""
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s Go"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mo"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s Ko"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "D_ihegerz"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Prest da flapiñ"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Prest da flapiñ"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Hegerz"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Hegerz"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "O lugañ"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "E_zvezant"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Ezlinenn"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Ezlinenn"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Diwelus"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "Dianav"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "fazi"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Digant"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "An daou"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Emezelañ"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Kasourien"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Kasour-ez"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Perzhidi"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Perzhiad-ez"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Gweladennerien"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Gweladenner-ez"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Perc'hener-ez"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Merour-ez"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Ezel"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "a zo aketus d'ar gaozeadenn"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "a ra un dra bennak all"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "a zo paouezet da skrivañ ar gemennadenn"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "he/en deus serret ar prenestr-flapiñ pe an ivinell"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6233,50 +6486,106 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "fazi: dibosupl eo digeriñ %s evit lenn"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "Cyan"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "o krouiñ titourva an istoradur"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "eus ar gont %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+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/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, 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
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Koumanantiñ"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "fazi en ur gas %s ( %s )"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Sal-flapiñ nevez"
+
+#~ msgid "Role: "
+#~ msgstr "Perzh:"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6298,10 +6607,6 @@ msgstr "[Sifret eo ar gemennadenn-mañ]"
 #~ msgid "Not Available "
 #~ msgstr "Dihegerz"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Dilemel"
-
 #~ msgid "Contact _Info"
 #~ msgstr "_Titouroù"
 
@@ -6332,9 +6637,6 @@ msgstr "[Sifret eo ar gemennadenn-mañ]"
 #~ 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"
@@ -6424,9 +6726,6 @@ msgstr "[Sifret eo ar gemennadenn-mañ]"
 #~ "Si cette case est cochée, Gajim placera une icône dans la zone de "
 #~ "notification"
 
-#~ msgid "_Online Users"
-#~ msgstr "Utilisateurs En _Ligne"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Commencer une discussion avec le compte %s"
diff --git a/po/cs.po b/po/cs.po
index ed37365e8..0c8383885 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-05-04 00:14+0200\n"
 "Last-Translator: Pihhan <pihhan@seznam.cz>\n"
 "Language-Team:  <cs@li.org>\n"
@@ -59,22 +59,26 @@ msgid "_Discover Services..."
 msgstr "_Prohlížet služby"
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Diskuze"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Upravit úč_et..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Otevři Emailový editor"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stav"
@@ -257,16 +261,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Obecné"
 
@@ -327,17 +333,17 @@ msgid "Manage..."
 msgstr "Spravovat..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Žádný"
 
@@ -626,11 +632,11 @@ msgstr "Editor rozšířeného nastavení"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Stav: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Pryč"
 
@@ -648,7 +654,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Neviditelný"
 
@@ -658,21 +664,25 @@ msgid "Launch a command"
 msgstr "příkaz"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Nedostupný"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Ukecaný"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "Přehrávat _zvuky"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -685,16 +695,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -753,7 +760,7 @@ msgid "for "
 msgstr "Port: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -788,7 +795,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "Přid_at do Seznamu"
 
@@ -811,7 +818,7 @@ msgstr "_Otevřít v prohlížeči"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Začít rozhovor"
 
@@ -820,7 +827,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Odeslat _Soubor"
@@ -837,12 +844,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historie"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "Ve skupině"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Nastavení místnosti"
 
@@ -928,11 +940,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Barvy záložky stavu rozhovoru</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Účet\n"
 "Skupina\n"
@@ -984,7 +997,7 @@ msgstr ""
 "MUC Directed\n"
 "Messages"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Pozastaveno"
 
@@ -1124,14 +1137,14 @@ msgstr "Odmítnout"
 msgid "Invitation Received"
 msgstr "Přijata pozvánka"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Přezdívka:"
 
@@ -1149,8 +1162,8 @@ msgstr "Nedávno:"
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Vstoupit"
 
@@ -1201,7 +1214,7 @@ msgstr "Spravuj profily Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -1217,14 +1230,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Akce"
 
@@ -1324,10 +1337,12 @@ msgid "Auto _not available after:"
 msgstr "Automaticky _nedostupný po:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Automaticky zjistit při každém startu aplikace\n"
@@ -1335,18 +1350,14 @@ msgstr ""
 "Vždy použít výchozí aplikace z KDE\n"
 "Vlastní"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "Pře_d přezdívkou:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Rozhovor"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "_Upozornění o stavu rozhovoru:"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1358,39 +1369,59 @@ msgstr ""
 "nemáte v Seznamu"
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Text stavu"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "Výchozí _ikony stavů:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Zobrazovat a_vatary kontaktů v Seznamu"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Zobrazovat p_opis stavu kontaktů v Seznamu"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "_Upozornění o stavu rozhovoru:"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "_Každých 5 minut"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Smajlíky:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Události"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim umí ohlašovat svoji schopnost posílat a přijímat meta-informace "
+"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:43
 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 "
@@ -1400,19 +1431,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:41
+#: ../data/glade/preferences_window.glade.h:44
 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:42
+#: ../data/glade/preferences_window.glade.h:45
 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:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1420,7 +1451,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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1428,18 +1459,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:45
+#: ../data/glade/preferences_window.glade.h:48
 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1447,7 +1478,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1455,7 +1486,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:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1463,7 +1494,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1473,7 +1504,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:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1481,11 +1512,15 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní "
 "animované nebo statické grafické smajlíky"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "Sp_ravovat..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1497,84 +1532,95 @@ msgstr ""
 "Podle účtu\n"
 "Podle typu"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Upozorni mě na kontakty které se: "
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Upozorni při novém _Gmail e-mailu"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "Při každé _zprávě"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "_Okno jednoduché zprávy:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "_Upozornění o stavu rozhovoru:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Přehrávat _zvuky"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Čas tisku:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Zobrazit pouze v _Seznamu"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "_Přihlásí"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "_Odhlásí"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "_Téma:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Text stavu automaticky pryč"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Text stavu nedostupný"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Používej ikony _transportů"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Ikona v systrayi (jinak řečeno v oznamovací oblasti)"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1586,96 +1632,102 @@ msgstr ""
 "nové zprávy nastane pouze tehdy, pokud je od kontaktu, se kterým už "
 "nehovoříte"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Když je přijata nová zpráva"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Editor rozšířeného nastavení"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_Po čase:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "Pře_d časem:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Správce souborů:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Písmo:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "Zvýrazňovat _slova s překlepy"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "_Příchozí zpráva:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "E-_mailový klient:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Upozornit mě"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Otevřít..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "_Odchozí zpráva:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Přehrávač:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "Zobrazit o_kno se zprávou"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "_Vrátit k výchozím barvám"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "_Seřadit podle stavu"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "_Stav:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minutách"
 
@@ -1706,7 +1758,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "_Připojit po startu Gajimu"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1724,7 +1776,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "Ban List"
@@ -1793,116 +1845,116 @@ msgid "City:"
 msgstr "Obec:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Společnost:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Země:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Oddělení:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Další adresa:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Křestní:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Dom. stránka:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Střední:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Více"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Osobní údaje"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefon:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Pozice:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "PSČ:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Titul:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Postavení:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Stát:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Ulice:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Za jménem:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Práce"
 
@@ -1943,47 +1995,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Odeslat jednoduchou _zprávu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Začít _rozhovor"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, 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:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, 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:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "Odst_ranit ze Seznamu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Autorizace"
 
@@ -2030,8 +2089,8 @@ msgstr "_Obsah"
 msgid "_Discover Services"
 msgstr "_Prohlížet služby"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Úpravy"
 
@@ -2121,35 +2180,41 @@ msgid "_Send & Close"
 msgstr "Ode_slat a zavřít"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Autorizuj"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Žádost o autorizaci"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Autorizuj"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "O_dmítnout"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Waw soubory"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Zobrazit všechny čekající _události"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Zobrazit _Seznam"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "S_tav"
 
@@ -2162,38 +2227,43 @@ msgstr "Žádá:"
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Komentář: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Kontakty"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stav:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Autorizace:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Zaznamenat historii konverzace"
@@ -2387,7 +2457,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2416,317 +2486,322 @@ msgstr "Spojení není dostupné"
 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:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Šifrování zapnuto"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Šifrování vypnuto"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "není v seznamu"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, 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:1527
+#: ../src/chat_control.py:1531
 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:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minut"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "text stavu"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "První zpráva přijata"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Další zpráva přijata"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Přijata pozvánka"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP není použitelné na tomto počítači"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Nepřečtené zprávy"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 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:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 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:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 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:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Připojit se teď znovu?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 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:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 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:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Výběr OpenPGP klíče"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 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:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Nemáte aktivní účet"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Seznam členů"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Seznam vlastníků"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Seznam správců"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Důvod"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Postavení"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Zakazuji..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2734,37 +2809,37 @@ msgstr ""
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 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:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 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:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 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:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2781,90 +2856,100 @@ msgstr ""
 "uživatel@doména),\n"
 "doména/zdroj, nebo adresa obsahující poddoménu."
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Smazat"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Čas tisku:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Diskuze"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 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:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Musíte zadat heslo pro nový účet."
 
-#: ../src/config.py:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 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:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Dvakrát použité Jabber ID"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Tento účet už je nastaven v Gajimu."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2872,23 +2957,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:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2896,254 +2981,263 @@ msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno po posledním čtení této "
 "diskuze"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "před %i dny"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Jméno kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "Ve skupině"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "ID klíče"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Jméno kontaktu"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "Text stavu %s"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Text stavu"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Uložit jako přednastavený stav"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Napište jméno pro tento stav"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adresa:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adresa:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Další adresa:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber client"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "DÍKY:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr "Petr Menšík <pihhan@seznam.cz>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr ""
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Žádost o autorizaci pro účet %s od %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Místnost nebo jméno serveru obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Skryje nadpis v okně diskuze"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3151,258 +3245,268 @@ msgid ""
 msgstr "Vyplňte ID kontaktu se kterým chcete začít rozhovor:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, 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:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nová zpráva"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Kontakt se odhlásil"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "XML Konzole"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Popis: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formát řádky</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formát řádky</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Soukromé rozhovory"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Neplatné uživatelské jméno"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Musíte zadat heslo pro nový účet."
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s Vás pozval(a) do místnosti %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Spojení"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Ostatní"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Diskuze"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3410,52 +3514,70 @@ msgstr ""
 "Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a "
 "opakujte znovu."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Procházím %s pomocí účtu %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Prohlížet"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 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:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
 # FIXME: tohle je blbe prelozene, najit v kontextu a vymyslet lepsi oznaceni
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skenuji %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Uživatelé"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Žádat autorizaci"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Žádat autorizaci"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Žádat autorizaci"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Soubor"
@@ -3481,7 +3603,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Vy"
 
@@ -3491,7 +3613,7 @@ msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Příjemce: "
 
@@ -3558,31 +3680,31 @@ msgstr "Popis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s Vám chce poslat soubor:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Co by jste rád(a) dělal(a)?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3618,12 +3740,11 @@ msgstr "Soubor: "
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Odesílatel: "
 
@@ -3631,33 +3752,33 @@ msgstr "Odesílatel: "
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim vyžaduje X server k běhu. Končím..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim vyžaduje PyGTK 2.6 nebo novější"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim potřebuje GTK 2.6 nebo novější"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime vyžaduje podporu libglade"
 
 # FIXME: runtime?
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3666,22 +3787,22 @@ msgstr ""
 "Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední stabilní "
 "verzi z %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 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
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vyžaduje PySQLite2"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim vyžaduje PySQLite2"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3689,87 +3810,87 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorizace pro %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Spojení"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Předmět: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "chyba při odesílání %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
 # FIXME: hrozna veta
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Uvidíte jej nebo ji vždy jako odpojenou."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je nyní %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 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
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový E-mail on %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3780,45 +3901,45 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Prosím vyplňte údaje pro Váš nový účet</b>"
@@ -3826,11 +3947,16 @@ 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Spojení není dostupné"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Podpora Správce sezení není dostupná (schází gnome.ui modul)"
 
@@ -3853,7 +3979,8 @@ msgid "Shows or hides the roster window"
 msgstr "Zobrazí nebo skryje okno Seznamu"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Otevře okno s další nepřečtenou zprávou"
 
 #: ../src/gajim-remote.py:82
@@ -4181,8 +4308,8 @@ msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "U¾ nejste v místnosti \"%s\" nebo \"%s\" ode¹el(a)."
 
 #: ../src/groupchat_control.py:141
@@ -4199,98 +4326,99 @@ msgid "Insert Nickname"
 msgstr "Změ_nit přezdívku"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s se přejmenoval na %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "Ve skupině"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je nyní %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Přezdívka nenalezena: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Místnost nemá žádné téma"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevypadá jako platné JID"
 
-#: ../src/groupchat_control.py:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Příkazy: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Použití: /%s <přezdívka|JID> [důvod], zakáže JID přístup do místnosti. "
 "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:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4298,12 +4426,12 @@ msgstr ""
 "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
 "nájemníkovi."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použití: /%s, smaže zprávy v okně."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4312,21 +4440,21 @@ 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:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Použití: /%s, skryje tlačítka rozhovoru."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 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:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4335,26 +4463,26 @@ 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:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 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:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 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:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4363,92 +4491,94 @@ 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:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr ""
 "Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, 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:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žádná další nápověda pro /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Pokud zavřete toto okno, budete odpojen(a) z této místnosti."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Příště _nezobrazovat"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 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:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavena"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, 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:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -4478,73 +4608,73 @@ msgstr "Detaily"
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Chyba při čtení souboru:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Uložit jako..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Nemůžu nalézt databázi s historií"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Kontakty"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Přezdívka"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Zpráva"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Předmět"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 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:184
+#: ../src/history_manager.py:188
 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 "
@@ -4558,27 +4688,27 @@ msgstr ""
 "\n"
 "V případě kliknutí na ANO prosím vyčkejte..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Exportuji záznamy historie..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, 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:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Tato operace je nevratná."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 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?"
@@ -4610,11 +4740,11 @@ msgstr "Status je nyní %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status je nyní %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Zprávy"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4654,132 +4784,133 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Přijata pozvánka"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 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
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Přihlížející"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "pomocí účtu %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Spravovat záložky..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Připojit se do diskuze"
 
-#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
-#: ../src/roster_window.py:3027
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, 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
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4787,12 +4918,12 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4801,73 +4932,122 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Kontakty"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Zadej heslo GPG klíče pro účet %s."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Přejmenovat"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Zadej heslo GPG klíče pro účet %s."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "Odst_ranit"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Odstraní kontakt ze Seznamu"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Nová místnost"
+msgid "_New group chat"
+msgstr "Diskuze"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 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:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Ode_slat zprávu serveru"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Přejme_novat"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+msgid "To all online users"
+msgstr ""
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "Přih_lásit"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Odhlásit"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš status."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, 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:2325
+#: ../src/roster_window.py:2617
 #, 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:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4875,7 +5055,7 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4883,17 +5063,17 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2629
 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í"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakt \"%s\" bude smazán z Vašeho rosteru"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4902,32 +5082,32 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:2411
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Zadej heslo GPG klíče pro účet %s."
 
-#: ../src/roster_window.py:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Uložit heslo"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 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:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4935,21 +5115,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:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4957,112 +5137,136 @@ msgstr ""
 "Zprávy bude možné číst později pouze v případě, budete-li mít povolenou "
 "historii."
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Musíte vytvořit účet před tím, než budete moci hovořit s jinými uživateli."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Smazat %s ve skupině %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, 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:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Změnit popis stavu..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Role:"
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Skryje toto menu"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Přidružení:"
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Poslední stav v %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "od %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Autorizace: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
+
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Přeneseno: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Nespuštěno"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Dokončeno"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Stagnuje"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Přenáším"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Tato služba dosud neodpověděla s detaily"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5070,161 +5274,161 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Přidružení:"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 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:267
+#: ../src/vcard.py:287
 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:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 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:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "vytvářím databázi historie"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s je soubor, ale měl by být adresář"
 
-#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim se nyní ukončí"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s je adresář, ale měl by být soubor"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "vytvářím adresář %s "
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, 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:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Pryč jako výsledek nečinnosti"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Nedostupný jako výsledek nečinnosti"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Ber * / _ páry jako možné formátovací znaky."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Přidat * a [n] k titulku Seznamu?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5232,11 +5436,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:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5244,11 +5448,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:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kolik řádků uložit pro Ctrl+Šipka nahoru."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5257,37 +5461,58 @@ 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:151
+#: ../src/common/config.py:153
 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:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 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:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 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:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 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:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5295,30 +5520,34 @@ 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:162
+#: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard říká KiB = 1024 bytů, KB = 1000 bytů."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Zobrazit záložku při jediném rozhovoru?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Zobrazit okraj záložky při jediném rozhovoru?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "Středníkem oddělený seznam slov, které budou zvýrazněny v diskuzích."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5326,13 +5555,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:187
+#: ../src/common/config.py:191
 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:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5340,7 +5569,7 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené "
 "zprávy. V závislosti na tématu, tato ikona může být animovaná."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5349,7 +5578,7 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí popis stavu, pokud není prázdný, pro každý "
 "kontakt pod jménem v okně Seznamu"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5357,7 +5586,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:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5366,29 +5595,37 @@ msgstr ""
 "Pokud vypnuto, nebudete vidět řádku se stavem v rozhovorech, když kontakt "
 "změní svůj stav."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5398,18 +5635,19 @@ msgstr ""
 "oknem (výchozí chování ve většině Window Managerů) pokud čekají nové "
 "události."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5428,67 +5666,82 @@ 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:205
+#: ../src/common/config.py:211
 #, 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:206
+#: ../src/common/config.py:212
 #, 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:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Skryje tlačítka v okně diskuze"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "Skryje tlačítka v okně rozhovoru dvou lidí"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Skryje nadpis v okně diskuze"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Skryje nadpis v okně rozhovoru dvou lidí"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skryje seznam lidí místnosti v okně diskuze"
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5496,150 +5749,147 @@ 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:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Připojen"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Ukecaný"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Nedostupný"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 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: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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "mariňák"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 msgid "Unable to load idle module"
 msgstr ""
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Nesprávné heslo"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5650,166 +5900,165 @@ msgstr ""
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1449
+#: ../src/common/connection_handlers.py:1519
 #, 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 ""
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
+msgstr "Připojit se do diskuze"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+msgid "A password is required to join this group chat."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1515
+#: ../src/common/connection_handlers.py:1585
 #, fuzzy
-msgid "You are banned from this room."
+msgid "You are banned from this group chat."
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+msgid "Such group chat does not exist."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+msgid "Group chat creation is restricted."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 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
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, fuzzy, python-format
 msgid "unsubscribe request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, 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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 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:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Transport %s odpověděl chybně na požadavek registrace."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Neplatná odpověď"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Připojen k server %s: %s s %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP heslo nebylo zadáno"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "neviditelný"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "odpojen"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "Jsem %s"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Tato zpráva je zašifrovaná]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5818,16 +6067,16 @@ msgstr ""
 "Předmět: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 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
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Možnosti D-Bus nemohou být použity"
 
@@ -6015,214 +6264,214 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Neplatný znak v uživatelském jméně."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Je potřeba adresa serveru."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Neplatný znak v hostname."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Nerušit"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "Přip_ojen"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Připojen"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "_Pryč"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Příjemce"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Odesílatel"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Obojí"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Žádná"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Vlastník"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Správce"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "Č_len"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, fuzzy, python-format
 msgid " %d unread message"
 msgid_plural " %d unread messages"
@@ -6230,7 +6479,7 @@ msgstr[0] "Gajim - %d nepřečtenou zprávu"
 msgstr[1] "Gajim - %d nepřečtené zprávy"
 msgstr[2] "Gajim - %d nepřečtených zpráv"
 
-#: ../src/common/helpers.py:877
+#: ../src/common/helpers.py:886
 #, fuzzy, python-format
 msgid " %d unread single message"
 msgid_plural " %d unread single messages"
@@ -6238,7 +6487,7 @@ msgstr[0] "Gajim - %d nepřečtenou prosté zprávu"
 msgstr[1] "Gajim - %d nepřečtené prosté zprávy"
 msgstr[2] "Gajim - %d nepřečtených zpráv"
 
-#: ../src/common/helpers.py:883
+#: ../src/common/helpers.py:892
 #, fuzzy, python-format
 msgid " %d unread group chat message"
 msgid_plural " %d unread group chat messages"
@@ -6246,7 +6495,7 @@ msgstr[0] "Gajim - %d nepřečtenou zprávu z diskuze"
 msgstr[1] "Gajim - %d nepřečtené zprávy z diskuze"
 msgstr[2] "Gajim - %d nepřečtených zpráv"
 
-#: ../src/common/helpers.py:889
+#: ../src/common/helpers.py:898
 #, fuzzy, python-format
 msgid " %d unread private message"
 msgid_plural " %d unread private messages"
@@ -6254,7 +6503,7 @@ 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6265,50 +6514,116 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "azurová"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "vytvářím databázi historie"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "účtu %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Spojení s protistranou se nepodařilo navázat."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+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/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, 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
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Tato zpráva je zašifrovaná]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Žádat autorizaci"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "chyba při odesílání %s ( %s )"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Nová místnost"
+
+#~ msgid "Role: "
+#~ msgstr "Role:"
+
+#~ msgid "Affiliation: "
+#~ msgstr "Přidružení:"
+
+#~ 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 ""
+#~ "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)"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6330,10 +6645,6 @@ msgstr "[Tato zpráva je zašifrovaná]"
 #~ msgid "Not Available "
 #~ msgstr "Nedostupný"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Smazat"
-
 #~ msgid "Contact _Info"
 #~ msgstr "_Informace o kontaktu"
 
@@ -6364,9 +6675,6 @@ msgstr "[Tato zpráva je zašifrovaná]"
 #~ 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"
diff --git a/po/de.po b/po/de.po
index 19acb5ac6..035e66936 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\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"
@@ -42,22 +42,26 @@ msgid "_Discover Services..."
 msgstr "_Durchsuche Dienste..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Gruppenchat"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Konto bearbeiten"
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "Email-Programm _öffnen"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
@@ -244,16 +248,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Allgemein"
 
@@ -315,17 +321,17 @@ msgid "Manage..."
 msgstr "Verwalten ..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Kein"
 
@@ -611,11 +617,12 @@ msgid "Advanced Notifications Control"
 msgstr "Erweiterter Benachrichtigungs-Editor"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
-msgid "All Status "
+#, fuzzy
+msgid "All statuses"
 msgstr "Alle Status "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Abwesend"
 
@@ -632,7 +639,7 @@ msgid "Have "
 msgstr "habe "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -641,19 +648,24 @@ msgid "Launch a command"
 msgstr "Starte ein Kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+#, fuzzy
+msgid "One or more special statuses..."
+msgstr "Einen speziellen Status ..."
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 msgid "Online / Free For Chat"
 msgstr "Frei zum Chatten"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid "Play a sound"
 msgstr "Klänge abspielen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -675,16 +687,13 @@ msgstr ""
 "Dateiübertragung begonnen\n"
 "Dateiübertragung beendet"
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr "Einen speziellen Status ..."
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr "Wenn "
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -742,7 +751,8 @@ msgid "for "
 msgstr "für "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+#, fuzzy
+msgid "when I'm in"
 msgstr "wenn ich bin "
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -776,7 +786,7 @@ msgstr "_Chatraum beitreten"
 #: ../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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "Zur Kont_aktliste hinzufügen"
 
@@ -799,7 +809,7 @@ msgstr "Link _öffnen"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "Chat starten"
 
@@ -808,7 +818,7 @@ msgid "Click to see past conversations with this contact"
 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/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "_Datei Senden"
@@ -825,12 +835,17 @@ msgstr "_Kompakte Ansicht 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Verlauf"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "Alle in der Gruppe"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Raum-Konfiguration"
 
@@ -920,11 +935,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Chatstatus Tabellenfarbe</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Konto\n"
 "Gruppe\n"
@@ -975,7 +991,7 @@ msgstr ""
 "MUC gerichtete\n"
 "Nachrichten"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Unterbrochen"
 
@@ -1115,14 +1131,14 @@ msgstr "Ablehnen"
 msgid "Invitation Received"
 msgstr "Einladung empfangen"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Spitzname:"
 
@@ -1140,8 +1156,8 @@ msgstr "Kürzlich:"
 msgid "Room:"
 msgstr "Raum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Betreten"
 
@@ -1191,7 +1207,7 @@ msgstr "Proxy Verwaltung"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Name:"
 
@@ -1207,14 +1223,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Aktionen"
 
@@ -1314,10 +1330,12 @@ msgid "Auto _not available after:"
 msgstr "Automatisch _nicht verfügbar nach:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Bei jedem Programmstart automatisch erkennen\n"
@@ -1325,18 +1343,14 @@ msgstr ""
 "Immer KDE Standard-Anwendungen verwenden\n"
 "Benutzerdefiniert"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "Vor d_em Spitznamen:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Chat"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "Sende Statusbenachrichtigungen:"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1348,38 +1362,58 @@ msgstr ""
 "Nachrichten von allen Kontakten blockiert, die nicht in ihrer Liste sind."
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default Status Messages"
 msgstr "Vorgegebene Status-Nachrichten"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "Standard Status-S_ymbole:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr "Zeige zusätzliche _Email-Details"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Zeige A_vatare von Kontakten im Roster"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Zeige die Status_nachrichten von Kontakten im Roster"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Sende Statusbenachrichtigungen:"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "Alle 5 _Minuten"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Ereignisse"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim kann Meta-Information, die eine Unterhaltung mit einem Kontakt "
+"betrifft, empfangen und versenden. Hier können Sie definieren welche "
+"Chatstates Sie Ihrem Gegenüber senden möchten."
+
+#: ../data/glade/preferences_window.glade.h:43
 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 "
@@ -1389,14 +1423,14 @@ msgstr ""
 "betrifft, empfangen und versenden. Hier können Sie definieren welche "
 "Chatstates Sie Ihrem Gegenüber senden möchten."
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Gajim zeigt neue Ereignisse automatisch anzeigen, indem das betreffende "
 "Fenster geöffnet wird"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1404,7 +1438,7 @@ msgstr ""
 "Gajim wird Sie über neue Ereignisse mit einem Popup in der rechten unteren "
 "Ecke des Bildschirms benachrichtigen"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1412,7 +1446,7 @@ msgstr ""
 "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Ecke des "
 "Bildschirmes über Kontakte informieren, die sich gerade angemeldet haben"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1420,20 +1454,20 @@ msgstr ""
 "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Bildschirmecke "
 "über Kontakte informieren, die sich gerade abgemeldet haben"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim wird nur das Symbol des Kontaktes ändern, von dem die neue Nachricht "
 "kommt"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1441,7 +1475,7 @@ msgstr ""
 "Wenn aktiviert, wird Gajim einen Avatar im Roster-Fenster und in "
 "Gruppenchats einblenden"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1449,7 +1483,7 @@ msgstr ""
 "Wenn aktiviert, wird Gajim für jeden Kontakt unter dem Kontaktnamen im "
 "Roster und im Gruppenchat-Fenster die Statusnachricht anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1457,7 +1491,7 @@ msgstr ""
 "Wenn gewählt, merkt sich Gajim die Position und Größe der Kontaktliste auf "
 "dem Bildschirm"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1467,7 +1501,7 @@ msgstr ""
 "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
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1475,11 +1509,15 @@ msgstr ""
 "Wenn nicht deaktivert, wird Gajim ASCII-Smilies wie ':)' mit äquivalenten "
 "graphischen Emoticons ersetzen"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "_Verwalte ..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1491,83 +1529,94 @@ msgstr ""
 "Pro Account\n"
 "Pro Typ"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Über Kontakte benachrichtigen, die sich "
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Notify on new _GMail email"
 msgstr "Über neue _Gmail E-Mail benachrichtigen"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "In jeder _Zeile"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "Ein _Nachrichtenfenster:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Sende Statusbenachrichtigungen:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "_Klänge abspielen"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Zeit anzeigen:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Nur in der _Kontaktliste anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "_anmelden"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "a_bmelden"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "T_hema:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Automatische Statusnachricht für Abwesend"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Automatische Statusnachricht für Nicht verfügbar"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "_Transport-Symbole verwenden"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr "Benutze System-_Voreinstellung"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Verwende _Trayicon (Benachrichtigungs-Icon)"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1580,95 +1629,101 @@ msgstr ""
 "wenn Sie eine Nachricht von einem Kontakt erhalten, mit dem Sie nicht "
 "bereits chatten"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Wenn neue Nachricht empfangen wird"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Advanced Notifications Control..."
 msgstr "_Erweiterter Konfigurations-Editor"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_Nach der Zeit:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "_Vor der Zeit:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Dateimanager:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Schriftart:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "_Eingehende Nachricht:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Logge die Statusveränderungen von Kontakten"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Mail-Programm:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Nie"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "Be_nachrichtigen"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "Ö_ffnen ..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "_Ausgehende Nachricht:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Player:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Öffnen"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "Auf Standard-Farben zu_rücksetzen"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "Kontakte nach Status _sortieren"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "_Statusnachricht:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "Minuten"
 
@@ -1697,7 +1752,7 @@ msgstr "Aktiviert für diese Sitzung"
 msgid "Active on each startup"
 msgstr "Bei jedem Programmstart aktiv"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr "Alle"
 
@@ -1713,7 +1768,7 @@ msgstr "Jabber-ID:"
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr "Privatliste"
 
@@ -1780,115 +1835,115 @@ msgid "City:"
 msgstr "Stadt:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Firma:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Land:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Abteilung:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Zusatz-Adresse:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Vorname:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Homepage:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Mittelname"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Mehr"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Personal Info"
 msgstr "Persönliche Details"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefon-Nr.:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Position:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Postleitzahl:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Präfix"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Rolle:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Staat:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Straße:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Suffix:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Arbeit"
 
@@ -1928,45 +1983,52 @@ msgstr "Open_PGP-Schlüssel zuweisen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1774
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:1954
 msgid "In_vite to"
 msgstr "Einladen zu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Einzelne Nachricht Senden"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "_Chat starten"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "_Allow him/her to see my status"
 msgstr "Er_laube ihm/ihr, meinen Status zu sehen"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 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:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "Entfernen von _Kontaktliste"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "Abonnement"
 
@@ -2012,8 +2074,8 @@ msgstr "In_halte"
 msgid "_Discover Services"
 msgstr "_Dienste durchsuchen"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Ändern"
 
@@ -2103,36 +2165,42 @@ msgid "_Send & Close"
 msgstr "_Senden & Schließen"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Autorisieren"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Abonnementanfrage"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Autorisieren"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Ablehnen"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Wav Dateien"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Zeige alle schwebenden _Ereignisse"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "_Roster anzeigen"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
@@ -2145,37 +2213,42 @@ msgstr "Frage:"
 msgid "Client:"
 msgstr "Client:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Kommentar: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "BS:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ressource:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Abonnement:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "Unterhaltungs-Ver_lauf"
@@ -2364,7 +2437,7 @@ msgstr "Schwedisch"
 msgid "Chinese (Ch)"
 msgstr "Chinesisch"
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2393,50 +2466,50 @@ msgstr "Keine Verbindung verfügbar"
 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:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s:·%(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Verschlüsselung aktiviert"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Nicht in der Liste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\""
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2444,96 +2517,101 @@ msgstr ""
 "Wenn sie das Fenster schließen und die History abgeschaltet haben, geht die "
 "Nachricht verloren."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Alle %s _Minuten"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "Statusnachricht"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Nächste empfangene Nachricht"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Gruppenchat Nachrichten-Hervorhebung"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Gruppenchat-Nachricht empfangen"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Einladung empfangen"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Verbindung muss beendet werden, um Kontonamen zu ändern."
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 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:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Kontoname wird bereits verwendet"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2541,177 +2619,177 @@ msgstr ""
 "Dieser Name wird bereits für einen anderen Ihrer Accounts verwendet. Bitte "
 "wählenSie einen anderen Namen."
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber ID"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID muss in der Form \"user@servername\" sein."
 
-#: ../src/config.py:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Proxy Port muss eine Portnummer sein."
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Jetzt neu einloggen?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 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:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Account nicht verfügbar"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 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:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr "Ihr Server unterstützt vCard nicht"
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:1570 ../src/config.py:3326
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 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:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Schlüssel-Auswahl"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP Schlüssel"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse lesen, bevor der Account entfernt wird."
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Kein aktives Konto"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Kontoname wird bereits verwendet"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "%s ändern"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Mitgliedsliste"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Listenbesitzer"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Verbanne ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2719,11 +2797,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Füge Mitglied hinzu ..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2731,11 +2809,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Füge Besitzer hinzu ..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2743,11 +2821,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Füge Administrator hinzu ..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2755,7 +2833,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2770,89 +2848,99 @@ 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:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geben Sie ihr Passwort für %s ein"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" ist mit Server verbunden"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Löschen"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Status anzeigen:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Gruppenchat"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Dieser Bookmark hat ungültige Daten"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 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:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 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:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
-#: ../src/config.py:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Doppelte Jabber ID"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Dieser Kontakt bwurde in Gajim bereits konfiguriert."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Account wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2861,23 +2949,23 @@ msgstr ""
 "oder durchklicken des Konto-Menüpunktes im Bearbeiten-Menü des Hauptfensters "
 "erreichen."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Kontoname ist schon vergeben"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2885,206 +2973,206 @@ msgstr ""
 "Text unterhalb dieser Linie stellt dar, was seit ihrem letzten Besuch in "
 "diesem Gruppenchat gesagt wurde"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "In Websuche URL fehlt ein \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "Im _Internet suchen"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "Vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktname: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i> "
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "Schlüssel-ID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status-Nachricht"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Status-Nachricht"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Als derzeitige Statusnachricht speichern"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "AIM-Adresse"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 #, fuzzy
 msgid "GG Number:"
 msgstr "GG Nummer"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 #, fuzzy
 msgid "ICQ Number:"
 msgstr "ICQ-Nummer"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "MSN-Adresse"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Yahoo!-Adresse"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer ID"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine resource enthalten."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Kontakt bereits im Roster"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Der Kontakt befindet sich bereit in Ihrem Roster."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "Ein GTK+ Jabber-Client"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr "Ins Deutsche übersetzt von Fridtjof Busse"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Konnte nicht mit Port %s verbinden."
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
@@ -3092,50 +3180,59 @@ msgstr ""
 "Möglicherweise läuft bei Ihnen bereits ein Gajim. Der Dateitransfer\n"
 "wird abgebrochen."
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abonnement-Anforderung für Konto %s von %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anforderung von %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Sie sind bereits im Raum %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Betrete Chatraum mit Account %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Ungültige Jabber ID"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Der Raum- oder Servername enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Versteckt das Banner im Gruppenchat-Fenster"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Account %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3145,252 +3242,262 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 msgid "Invalid JID"
 msgstr "Ungültige JID"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort zu ändern"
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Dateitransfer Anfrage"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Dateitransfer-Fehler"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Dateitransfer beendet"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Dateitransfer gestoppt"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht mit Account %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht in Account %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsole für %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "XML Konsole"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatliste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Beschreibung: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatliste für %s"
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 msgid "Privacy Lists"
 msgstr "Privatlist"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Ungültiger Benutzername"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Sie müssen ein Passwort für das neue Konto eingeben."
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s hat Sie in %(room_jid)s eingeladen"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Wav Dateien"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr "Nr."
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 msgid "Condition"
 msgstr "Bedingung"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr "wenn Ich bin "
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Andere"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Konferenz"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Sie müssen angemeldet sein um Dienste zu durchsuchen"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste durchsuchen für Konto %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3398,51 +3505,70 @@ 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:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Durchsuche %s mit Konto %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Durchsuche"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Durchsuche %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Beschreibung"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Abonnieren"
+
+#: ../src/disco.py:1738
+#, fuzzy
+msgid "New post"
+msgstr "Neuer Raum"
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Abonnieren"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Abonnieren"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Datei"
@@ -3468,7 +3594,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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Sie"
 
@@ -3478,7 +3604,7 @@ msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Empfänger: "
 
@@ -3545,12 +3671,12 @@ msgstr "Beschreibung: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s möchte ihnen eine Datei senden:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -3558,20 +3684,20 @@ msgstr ""
 "Eine Datei dieses Namens existiert bereits, und Sie haben nicht die Rechte, "
 "sie zu überschreiben."
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Diese Datei existiert schon"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Was möchten Sie tun?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 "Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien "
@@ -3609,12 +3735,11 @@ msgstr "Datei: "
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Absender: "
 
@@ -3622,31 +3747,31 @@ msgstr "Absender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim benötigt einen laufenden Xserver. Breche ab ..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim benötigt PyGTK 2.6 oder höher"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim benötigt GTK 2.6 oder höher"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim benötigt GTK 2.6+. Breche ab ..."
 
-#: ../src/gajim.py:61
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtine fehlt libglade-Unterstützung"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3655,23 +3780,23 @@ msgstr ""
 "Bitte entfernen Sie Ihre derzeitige GTK+ Laufzeitumgebung und installieren "
 "Siedie aktuelle Version von %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 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
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim benötigt PySQLite2 zum Starten"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim benötigt PySQLite2 zum Starten"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3679,11 +3804,11 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr "Gajim läuft bereits"
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3691,77 +3816,77 @@ msgstr ""
 "Eine andere Instanz von Gajim schein bereits zu laufen\n"
 "Trotzdem starten?"
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorisierung für %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Verbindung"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, python-format
 msgid "Subject: %s"
 msgstr "Thema: %s"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "Fehler beim Senden von %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Sie werden den Kontakt ab sofort als offline sehen."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s ist jetzt %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Neue E-Mail auf %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3771,7 +3896,7 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -3780,49 +3905,54 @@ msgstr ""
 "\n"
 "Von: %(from_address)s"
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte ihnen eine Datei senden."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Keine Verbindung verfügbar"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sitzungsmanagment-Unterstützung nicht verfügbar (fehlendes gnome.ui Modul)"
@@ -3846,7 +3976,8 @@ msgid "Shows or hides the roster window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Zeige Popup-Fenster mit der nächsten ungelesenen Nachricht"
 
 #: ../src/gajim-remote.py:82
@@ -4172,8 +4303,8 @@ msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Sie sind nicht mehr im Raum \"%s\" oder \"%s\" hat den Raum verlassen."
 
 #: ../src/groupchat_control.py:141
@@ -4189,99 +4320,100 @@ msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s wurde rausgeschmissen: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s hat den Raum verlassen"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "Alle in der Gruppe"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s ist jetzt %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Spitzname nicht gefunden: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Dieser Raum hat kein Thema"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, 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:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandos: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Bedienung: /%s <Spitzname|JID> [Grund], bannt die JID aus dem Raum. Der "
 "Spitznameeines Inhabers kann hinzugefügt werden, aber nicht, wenn es ein \"@"
 "\" enthält. Wenn die JIDderzeit im Raum ist, wird er/sie/es ebenfalls "
 "gebannt. Unterstützt KEINE Leerzeichen im Spitznamen."
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4289,12 +4421,12 @@ msgstr ""
 "Bedienung: /%s <Spitzname>, öffnet ein privates Chatfenster mit dem "
 "spezifierten Inhaber."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bedienung: /%s, leert das Textfenster."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4303,21 +4435,21 @@ msgstr ""
 "Bedienung: /%s [Grund], schließt das aktuelle Fenster oder Tab, mit Anzeige "
 "eines Grundes falls angegeben."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Verwendung: /%s, versteckt die Chatbuttons."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Bedienung: /%s <JID> [Grund], lädt die JID in den aktuellen Raum, optional "
 "mit der Angabe eines Grundes."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4326,27 +4458,27 @@ msgstr ""
 "Bedienung: /%s <Raum>@<Server> [/Spitzname], bietet den Beitritt zu "
 "Raum@Server an, optional mit Spitznamen."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 msgstr ""
 "Bedienung: /%s <Spitzname> [Grund], verweist den Inhaber des Spitznamen des "
 "Raumes und zeigt optional einen Grund. Unterstützt KEINE Leerzeichen im "
 "Spitznamen."
 
-#: ../src/groupchat_control.py:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "Bedienung: /%s <Aktion>, sendet die Aktion im aktuellen Raum. Verwende "
 "dritte Person, z.B. /%s explodiert)."
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4356,23 +4488,23 @@ msgstr ""
 "Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
 "Spitznamen."
 
-#: ../src/groupchat_control.py:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Bedienung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Raum."
 
-#: ../src/groupchat_control.py:1250
-#, python-format
-msgid "Usage: /%s , display the names of room occupants."
+#: ../src/groupchat_control.py:1255
+#, fuzzy, python-format
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Benutzung: /%s , zeigt die Namen der Raumbesucher."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Benutzung: /%s [topic], zeigt oder aktualisiert das derzeitige Raumthema."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4380,73 +4512,75 @@ msgstr ""
 "Benutzung: /%s <Nachricht>, sendet eine Nachricht ohne andere Befehle zu "
 "beachten."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Keine Hilfe vorhanden für /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Möchten Sie den Raum \"%s\" wirklich verlassen?g"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Raum "
 "geschlossen."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Bitte bestimmen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 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:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Bookmark existiert schon"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, 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:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark wurde erfolgreich hinzugefügt"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rausschmeißen"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -4477,77 +4611,77 @@ msgstr "Details"
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr "Erweiterung wird nicht unterstützt."
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, 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?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 msgid "Save Image as..."
 msgstr "Bild speichern unter ..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Kann Verlaufslog-Datenkbank nicht finden"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Kontakte"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Nachricht"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Betreff"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 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:184
+#: ../src/history_manager.py:188
 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 "
@@ -4561,26 +4695,26 @@ msgstr ""
 "\n"
 "Falls Sie JA klicken, warten Sie bitte einen Augenblick ..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Exportiere Verlaufslog ..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, 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:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Dies ist ein unwiderruflicher Vorgang."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 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?"
@@ -4611,11 +4745,11 @@ msgstr "Status ist jetzt: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status ist jetzt: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4655,47 +4789,47 @@ msgstr "%(nickname)s:·%(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Einladung empfangen"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "vCard Veröffentlichung fehlgeschlagen"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4703,86 +4837,87 @@ msgstr ""
 "Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
 "aufgetreten, versuchen Sie es später nochmals."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Beobachter"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Sie können einem Chatraum nicht beitreten, wenn Sie unsichtbar sind."
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "mit Konto %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "an %s Konto"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "mit %s Konto"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "von Konto %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Verwalte Bookmarks ..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "für Konto %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Verlaufsmanager"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Chatraum betreten"
 
-#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
-#: ../src/roster_window.py:3027
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, 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
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4790,11 +4925,11 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten von diesem Transport "
 "austauschen."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4803,71 +4938,122 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten von diesen Transporten "
 "austauschen:%s"
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Kontakt"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Geben Sie die GPG-Passphrase für das Konto %s ein."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Umbenennen"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Geben Sie die GPG-Passphrase für das Konto %s ein."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Entfernen"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Entfernt den Kontakt aus dem Roster"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel Zuweisen"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
-msgid "_New room"
-msgstr "_Neuer Raum"
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
+#, fuzzy
+msgid "_New group chat"
+msgstr "Gruppenchat"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Ich würde dich gerne in meine Liste aufnehmen"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Sende Neue Nachricht"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "_Umbenennen"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "_Angemeldete Benutzer"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Anmelden"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Abmelden"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt ihren Status."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4875,7 +5061,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:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4883,17 +5069,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:2334
+#: ../src/roster_window.py:2629
 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:2338
+#: ../src/roster_window.py:2633
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4903,34 +5089,34 @@ msgstr ""
 "entziehen Sie ihnen auch die Authorisation, wodurch die Kontakte Sie nur "
 "noch als offline sehen werden."
 
-#: ../src/roster_window.py:2411
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, 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:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Passphrase speichern"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 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:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4938,132 +5124,157 @@ msgstr ""
 "Wenn Sie Ihren Status auf unsichtbar setzen, werden sie von diesen "
 "Gruppenchats getrennt. Sind Sie sicher, dass sie unsichtbar werden möchten?"
 
-#: ../src/roster_window.py:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 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:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Sie müssen ein Konto erstellen, bevor Sie zum Jabber-Netzwerk verbinden "
+"können."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Setze %s in Gruppe %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Mache %s und %s Metakontakte"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht ..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "Ändere _Statusnachricht ..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Rolle:"
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Versteckt dieses Menü"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Zugehörigkeit: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber-ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Letzter Status auf %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "seit %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber-ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Abonnement: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
+
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Übertragen: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Abgeschlossen"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Steht still"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Übertrage"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Dieser Dienst hat nicht mit detaillierten Informationen geantwortet"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5071,25 +5282,25 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich verwaltet oder defekt"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "seit %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Zugehörigkeit: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5097,7 +5308,7 @@ msgstr ""
 "Dieser Kontakt ist an Ihren Anwesenheitsinformationen interessiert, aber Sie "
 "sindnicht an seiner/ihrer Anwesenheit interessiert"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5105,14 +5316,14 @@ msgstr ""
 "Sie sind an den Anwesenheitsinformationen des Kontakts interessiert, aber er/"
 "sieist nicht an ihren interessiert"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5120,122 +5331,122 @@ msgstr ""
 "Sie sind nicht an der Anwesenheit des Kontakts interessiert, und er/sie "
 "istnicht interessiert an ihrer"
 
-#: ../src/vcard.py:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " resource mit Priorität "
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s ist eine Datei, kein Verzeichnis"
 
-#: ../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:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, 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:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, 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:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Abwesend, da untätig"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Nicht verfügbar, da untätig"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr "Sprache der Rechtschreib-Prüfung"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Füge * und [n] in die Kontaktleiste?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5243,12 +5454,12 @@ msgstr ""
 "Wie viele Zeilen von der vorherigen Unterhaltung gespeichert werden, wenn "
 "ein Chat Tab/Fenster wieder geöffnet wird."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5256,11 +5467,11 @@ msgstr ""
 "Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
 "(Mirabilis ICQ-Client Standardeinstellung)."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5269,7 +5480,7 @@ 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:151
+#: ../src/common/config.py:153
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Falls aktiviert kann Gajim aus der Ferne mittels gajim-remote kontrolliert "
@@ -5277,31 +5488,52 @@ msgstr ""
 
 #: ../src/common/config.py:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Gruppenchat Tab/Fenster geschlossen wird."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Immer fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-"
 "seperierten\"Liste von Raumnamen geschlossen wird."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Niemals fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-"
 "seperiertenListe von Raumnamen geschlossen wird."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5309,31 +5541,36 @@ msgstr ""
 "Überschreibt den Host für Datenübertragung für den Fall von NAT/Port-"
 "Forwarding"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC-Standard sagt KiB = 1024 Byte, KB = 1000 Byte."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:168
+#, fuzzy
+msgid "Notify of events in the system trayicon."
+msgstr "Zeige keinen Avatar für den Transport selber."
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Tab bei einer einzelnen Unterhaltung anzeigen?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Tab-Grenze im Chat-Fenster anzeigen?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Schließen-Button im Tab anzeigen?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Eine mit Semilkolon getrennte List von Worten, die in einem Gruppenchat "
 "hervorgehoben werden."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5342,11 +5579,11 @@ msgstr ""
 "geklickt wird.Diese Option wird nur beachtet, wenn die Trayicon-"
 "Unterstützung aktiv ist."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:191
 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:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5354,7 +5591,7 @@ msgstr ""
 "Falls wahr. wird Gajim ein Icon auf jedem Tab mit ungelesenen Nachrichten "
 "anzeigen.Abhängig vom Theme ist dieses Icon animiert."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5363,7 +5600,7 @@ msgstr ""
 "Falls aktiviert, wird Gajim für jeden Kontakt die Statusnachricht, falls "
 "nicht leer, unter dem jeweiligen Kontaktnamen im Roster anzeigen"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5371,7 +5608,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:192
+#: ../src/common/config.py:196
 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."
@@ -5379,32 +5616,40 @@ msgstr ""
 "Falls deaktiviert, werden Sie keine Statuszeile im Chat sehen, wenn ein "
 "Kontakt seinen Status und/oder seine Statusnachricht ändert."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 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."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr "Zeige keinen Avatar für den Transport selber."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 #, fuzzy
 msgid "Don't show roster in the system taskbar."
 msgstr "Zeige keinen Avatar für den Transport selber."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5414,18 +5659,19 @@ msgstr ""
 "sind, lasse das Fenster bei neuen Ereignissen aufblitzen (Standardverhalten "
 "in den meisten Window-Managers) "
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5445,74 +5691,89 @@ msgstr ""
 "einem speziellen Fenster. Falls Sie diese Option ändern, muss Gajim neu "
 "gestartet werden, damit die Änderungen übernommen werden"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 #, 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:206
+#: ../src/common/config.py:212
 #, 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:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Versteckt die Button im Gruppenchat-Fenster"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "Versteckt die Buttons im Zwei-Personen-Chatfenster"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Versteckt das Banner im Gruppenchat-Fenster"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "Versteckt die Raumbenutzerliste im Gruppenchat-Fenster"
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 #, 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:215
+#: ../src/common/config.py:221
 #, 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
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 Workaround"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5520,152 +5781,149 @@ 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:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr "alle oder Leerzeichen-getrennter Status"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nein' oder 'beide'"
 
-#: ../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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr "'ja, 'nein' oder ''"
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, also hinterlasst eine Nachricht."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Arbeit"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Ich bin angemeldet"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Ich bin nicht da"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 #, fuzzy
 msgid "Do not disturb."
 msgstr "Bitte nicht stören"
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 #, fuzzy
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 "Abzuspielender Ton, falls eine MUC-Nachricht eines der Wörter aus der "
 "muc_highlights_works-Liste enthält oder wenn die Nachricht Ihren Nickname "
 "erhält."
 
-#: ../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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 msgstr ""
-"Abzuspielender Ton, falls eine MUC-Nachricht ankommt. (Diese Einstellung "
-"wirdnur beachtet, wenn notify_on_all_muc_messages aktiviert ist)"
 
-#: ../src/common/config.py:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "gemüse"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "menschlich"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "Marine"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid "Wrong host"
 msgstr "Falscher Host"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5679,49 +5937,54 @@ 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
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Fehler beim Betreten des Raum"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 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."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Sie sind aus diesem Raum gebannt"
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Dieser Raum existiert nicht."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "Raumerstellung ist beschränkt"
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Sie müssen Ihren registrierten Spitznamen verwenden"
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Sie sind nicht in der Mitgliedliste"
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5730,27 +5993,27 @@ msgstr ""
 "Benutzer registriert.\n"
 "Bitte geben Sie einen anderen Benutzernamen an:"
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "wir haben jetzt %s abonniert"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Kündigung des Abonnements von %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s hat das Abonnement beendet"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5760,89 +6023,87 @@ msgstr ""
 "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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"Um weiterhin Nachrichten Senden und Empfangen zu können, müssen Sie sich erneut verbinden."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Transport %s beantwortete unsere Registrierungsanfrage nicht korrekt."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Verbunden mit Server %s:%s mit %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 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:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "Keine OpenPGP-Passphrase gewählt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "unsichtbar"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "abgemeldet"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "Ich bin %s"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Diese Nachricht ist verschlüsselt]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5851,16 +6112,16 @@ msgstr ""
 "Thema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt aufgrund eines Unsichtbar-Status"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Auf diesem Computer fehlen die Python Bibliotheken für D-Bus"
 
-#: ../src/common/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-BUS-Möglichkeiten können nicht genutzt werden"
 
@@ -6050,242 +6311,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Ungültiges Zeichen im Benutzernamen"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Server-Adresse wird benötigt."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Ungültiges Zeichen in Hostname."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Ungültiges Zeichen in Resource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../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 "Available"
 msgstr "Angemeldet"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Verbinde"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "_Abwesend"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "Hat Fehler"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "An"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Von"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "Keine:"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Besitzer"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrator"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Mitglied"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "schreibt im Moment nicht mehr ..."
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6296,48 +6557,117 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "für Konto %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Um weiterhin Nachrichten Senden und Empfangen zu können, müssen Sie sich "
+"erneut verbinden."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, 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
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Konnte nicht mit Port %s verbinden."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Konnte nicht mit %s verbinden"
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Diese Nachricht ist verschlüsselt]"
 
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "Fehler beim Senden von %s ( %s )"
+
+#~ msgid "_New room"
+#~ msgstr "_Neuer Raum"
+
+#~ msgid "Role: "
+#~ msgstr "Rolle:"
+
+#~ msgid "Affiliation: "
+#~ msgstr "Zugehörigkeit: "
+
+#~ 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 ""
+#~ "Abzuspielender Ton, falls eine MUC-Nachricht ankommt. (Diese Einstellung "
+#~ "wirdnur beachtet, wenn notify_on_all_muc_messages aktiviert ist)"
+
 #~ msgid "Create your own Privacy Lists"
 #~ msgstr "Erstelle eigene Privatliste"
 
@@ -6347,9 +6677,6 @@ msgstr "[Diese Nachricht ist verschlüsselt]"
 #~ msgid "Contact _Info"
 #~ msgstr "Kontakt-_Info"
 
-#~ msgid "New Room"
-#~ msgstr "Neuer Raum"
-
 #~ msgid "Jabber ID"
 #~ msgstr "Jabber-ID"
 
@@ -6371,9 +6698,6 @@ msgstr "[Diese Nachricht ist verschlüsselt]"
 #~ 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"
@@ -6392,9 +6716,6 @@ msgstr "[Diese Nachricht ist verschlüsselt]"
 #~ msgid "_Account:"
 #~ msgstr "Konto:"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Abonnieren"
-
 #, fuzzy
 #~ msgid "Add"
 #~ msgstr "Adresse"
@@ -6415,10 +6736,6 @@ msgstr "[Diese Nachricht ist verschlüsselt]"
 #~ msgid "Not Available "
 #~ msgstr "Nicht verfügbar"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Löschen"
-
 #~ msgid "Contact Information"
 #~ msgstr "Kontakt-Information"
 
@@ -6504,9 +6821,6 @@ msgstr "[Diese Nachricht ist verschlüsselt]"
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "Wenn gewählt, wird Gajim ein Tray-Symbol verwenden"
 
-#~ msgid "_Online Users"
-#~ msgstr "_Angemeldete Benutzer"
-
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Starte Chat mit Account %s"
 
@@ -6646,9 +6960,6 @@ msgstr "[Diese Nachricht ist verschlüsselt]"
 #~ msgid "Chat with"
 #~ msgstr "Unterhalten mit"
 
-#~ msgid "Send New Message"
-#~ msgstr "Sende Neue Nachricht"
-
 #~ msgid "as %s"
 #~ msgstr "als %s"
 
diff --git a/po/el.po b/po/el.po
index 57bc967f6..2e5e18720 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-04-19 18:47+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Hellenic-Ελληνικά-Greek\n"
@@ -49,22 +49,26 @@ msgid "_Discover Services..."
 msgstr "Εύρεση _Υπηρεσιών..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Ομαδική συζήτηση"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Επεξεργασία λογαριασμού..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Άνοιγμα προγράμματος αλληλογραφίας"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Κατάσταση"
@@ -251,16 +255,18 @@ msgid "Edit Personal Information..."
 msgstr "Τροποποίηση προσωπικών πληροφοριών..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Γενικά"
 
@@ -324,17 +330,17 @@ msgid "Manage..."
 msgstr "Διαχείριση..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 msgid "No key selected"
 msgstr "Καμία επιλογή κλειδιού"
 
 #. None means no proxy profile selected
-#: ../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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Τίποτα"
 
@@ -625,11 +631,11 @@ msgstr "Επεξεργασία ρυθμίσεων για προχωρημένο�
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Κατάσταση: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Απομακρυσμένος"
 
@@ -647,7 +653,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Αφανής"
 
@@ -657,21 +663,25 @@ msgid "Launch a command"
 msgstr "εντολή"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -684,16 +694,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -753,7 +760,7 @@ msgid "for "
 msgstr "Θύρα: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -787,7 +794,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Προσθήκη στη λίστα επαφών"
 
@@ -810,7 +817,7 @@ msgstr "_Άνοιγμα δεσμού σε περιηγητή"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Έναρξη κουβέντας"
 
@@ -819,7 +826,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Αποστολή _αρχείου"
@@ -836,12 +843,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Ιστορικό"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "Στην ομάδα"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Ρυθμίσεις δωματίου"
 
@@ -928,11 +940,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Χρώματα κατάστασης κουβέντας</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Λογαριασμός\n"
 "Ομάδα\n"
@@ -983,7 +996,7 @@ msgstr ""
 "Μηνύματα προς\n"
 "ομαδικές κουβέντες"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Παύση"
 
@@ -1124,14 +1137,14 @@ msgstr "Άρνηση"
 msgid "Invitation Received"
 msgstr "Παραλήφθηκε μια πρόσκληση"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε Ομαδική συζήτηση"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
 #: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Όνομα χρήστη:"
 
@@ -1149,8 +1162,8 @@ msgstr "Πρόσφατα:"
 msgid "Room:"
 msgstr "Δωμάτιο:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
@@ -1203,7 +1216,7 @@ msgstr "Διαχείριση προφίλ μεσολαβητή"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Όνομα:"
 
@@ -1219,14 +1232,14 @@ msgstr "Χρήση πιστοποίησης"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Ενέργειες"
 
@@ -1327,10 +1340,12 @@ msgid "Auto _not available after:"
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Αυτόματη ανίχνευση σε κάθε έναρξη του Gajim\n"
@@ -1338,18 +1353,14 @@ msgstr ""
 "Πάντα χρήση των προεπιλεγμένων εφαρμογών του KDE\n"
 "Προσαρμοσμένες ρυθμίσεις"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "Π_ριν το ψευδώνυμο:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Κουβέντα"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1361,39 +1372,59 @@ msgstr ""
 "όλα τα μηνύματα από κάθε επαφή που δεν έχετε στη λίστα επαφών σας"
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "Εξορισμού _σετ εικονιδίων κατάστασης:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "Κάθε 5 _λεπτά"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Φατσούλες:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Γεγονότα"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Το Gajim μπορεί να να στέλνει και να λαμβάνει μετα-πληροφορίες σχετικές με "
+"μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
+"θέλετε να στέλνετε στους άλλους."
+
+#: ../data/glade/preferences_window.glade.h:43
 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 "
@@ -1403,13 +1434,13 @@ msgstr ""
 "μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
 "θέλετε να στέλνετε στους άλλους."
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Το Gajim θα εμφανίσει αυτόματα νέα γεγονότα αναδύοντας το ανάλογο παράθυρο"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1417,7 +1448,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει για το νέο μήνυμα μέσω ενός αναδυόμενου "
 "παραθύρου στο κάτω δεξιά μέρος της οθόνης"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1425,7 +1456,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις συνδέθηκαν στο Jabber"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1433,19 +1464,19 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Το Gajim θα αλλάξει μόνο το εικονίδιο της επαφής που προκάλεσε το νέο γεγονός"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1453,7 +1484,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1461,7 +1492,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
 "κάτω από τα ονόματα τους στη λίστα επαφών και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1469,7 +1500,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα θυμάται την θέση και το μέγεθος του κύριου "
 "παραθύρου την επόμενη φορά που θα εκτελεστεί"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1479,7 +1510,7 @@ msgstr ""
 "πρωτόκολλο της επαφής. (πχ. Μια επαφή από το MSN θα έχει το αντίστοιχο msn "
 "εικονίδιο για τις καταστάσεις διαθέσιμος, απομακρυσμένος κλπ..)"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1487,11 +1518,15 @@ msgstr ""
 "Αν δεν απενεργοποιηθεί, το Gajim θα μετατρέπει όλα ascii σύμβολα όπως το "
 "':)' με τις αντίστοιχες γραφικές φατσούλες"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "Δια_χείριση..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1503,86 +1538,97 @@ msgstr ""
 "Ανά λογαριασμό\n"
 "Ανά τύπο"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Ειδοποίηση σε νέο μήνυμα στο _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "Παρά_θυρο ενός μηνύματος:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Εμφάνιση χρόνου:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Αποθήκευση _θέσης και μεγέθους για τη λίστα επαφών και για τα παράθυρα "
 "κουβέντας"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Εμφά_νισε το μόνο στο κύριο παράθυρο"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "Σύν_δεση"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "Αποσ_ύνδεση"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "_Θέμα:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Αυτόματο μήνυμα για κατάσταση απομακρυσμένος"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Αυτόματο μήνυμα για κατάσταση μη διαθέσιμος"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1594,96 +1640,102 @@ msgstr ""
 "Συμβάντα για νέα μηνύματα δημιουργούνται μόνο όταν λαμβάνονται μηνύματα από "
 "επαφές με τις οποίες δεν κουβεντιάζετε ήδη"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "Μετά α_πό χρόνο:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "_Πριν από χρόνο:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Περιηγητής:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Διαχειριστής αρχείων:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Γραμματοσειρά:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Αγνόησε γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "_Εισερχόμενο μήνυμα:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Εφαρμογή αλληλογραφίας:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Ποτέ"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Ειδοποίησε με για αυτό"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Άνοιγμα..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "Ε_ξερχόμενο μήνυμα:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Αναπαραγωγέας:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Εμφάνισε το"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "Μήνυμα κατά_στασης:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "Διεύ_θυνση:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "λεπτά"
 
@@ -1714,7 +1766,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1732,7 +1784,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Διακομιστής:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "Λίστα Ban"
@@ -1801,116 +1853,116 @@ msgid "City:"
 msgstr "Πόλη:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Εταιρία:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Χώρα:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Τμήμα"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Επιπλέον οδός:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "Format: YYYY-MM-DD"
 msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Δοθέν όνομα"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Προσωπ. σελίδα:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Μέσο:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Περισσότερα"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Προσωπικές Πληροφορίες"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Τηλέφωνο:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Θέση:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Τ.Κ.:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Πρόθεμα:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Ρόλος:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Νομός:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Οδός:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Κατάληξη:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Δουλειά"
 
@@ -1951,47 +2003,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Επεξεργασία _ομάδων"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Αποστολή ενός _μηνύματος"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Έναρξη _συζήτησης"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Επίτρεψε τον/την να βλέπει την κατάστασή μου"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Απαγόρευσε τον/την να βλέπει την κατάστασή μου"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "Α_φαίρεση από τη Λίστα επαφών"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Εγγραφή"
 
@@ -2037,8 +2096,8 @@ msgstr "_Περιεχόμενα"
 msgid "_Discover Services"
 msgstr "Εύρεση _υπηρεσιών"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
@@ -2128,37 +2187,43 @@ msgid "_Send & Close"
 msgstr "_Αποστολή & Κλείσιμο"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Εξουσιοδότηση"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 msgid "Authorize contact so he can know when you're connected"
 msgstr ""
 "Εξουσιοδοτήστε μια επαφή ώστε να μπορεί να ξέρει πότε είστε συνδεδεμένος"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Αίτηση εγγραφής"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Εξουσιοδότηση"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Άρνηση"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Αρχεία ήχου Wav"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Εμφάνιση όλων των γεγονότων που εκρεμούν"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Εμφάνιση _λίστας επαφών"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Κατάσ_ταση"
 
@@ -2171,38 +2236,43 @@ msgstr "Ζητείται:"
 msgid "Client:"
 msgstr "Εφαρμογή:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Σχόλιο: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Επαφές"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "Λειτ. Σύστημα:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Πόρος:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Κατάσταση:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Εγγραφή:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Καταγραφή ιστορικού κουβέντας"
@@ -2396,7 +2466,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2425,50 +2495,50 @@ msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/chat_control.py:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Κουβέντες"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "Ο/η %s δεν έχει στείλει ένα κλειδί OpenPGP ούτε εσείς έχετε εφαρμόσει κάποιο"
 
-#: ../src/chat_control.py:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "εκτός λίστας επαφών"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2476,98 +2546,103 @@ msgstr ""
 "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 "μήνυμα θα χαθεί."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Κάθε %s _λεπτά"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Ενεργοποιημένο"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Λήφθηκε το πρώτο μήνυμα"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Επισήμανση "
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής κουβέντας"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Παραλήφθηκε μια πρόσκληση"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Αδιάβαστα γεγονότα"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να διαβάσετε όλα τα εκκρεμή "
 "γεγονότα."
 
-#: ../src/config.py:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2575,184 +2650,184 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δε μπορεί να έχει κενά."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Μη έγκυρη καταχώρηση"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Νέα είσοδος τώρα;"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
 "συνδεθείτε ξανά."
 
-#: ../src/config.py:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../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
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες."
 
-#: ../src/config.py:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:1570 ../src/config.py:3326
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Σφάλμα κατά τη λήψη του OpenPGP μυστικών κλειδιών σας."
 
-#: ../src/config.py:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το OpenPGP κλειδί σας"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Διακομιστής"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Ανάγνωση όλων των γενονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Λίστα Ban"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Λίστα μελών"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Λίστα ιδιοκτητών"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Λίστα διαχειριστών"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Αιτία"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Ρόλος"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Απαγορεύεται η πρόσβαση..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2760,11 +2835,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να αποβάλλετε;</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Προσθήκη μέλους..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2772,11 +2847,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε μέλος;</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Προσθήκη ιδιοκτήτη..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2784,11 +2859,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε ιδιοκτήτη;</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Προσθήκη διαχειριστή..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2796,7 +2871,7 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε διαχειριστή;</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2812,92 +2887,102 @@ msgstr ""
 "4. τομέας (ταιριάζει ο τομέας, και κάθε χρήστης@τομέας,\n"
 "τομέας/πόρος, ή διεύθυνση που περιέχει υποτομέα."
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Διαγραφή"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Εμφάνιση χρόνου:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Ομαδική συζήτηση"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε το σελιδοδείκτη."
 
-#: ../src/config.py:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
 
-#: ../src/config.py:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: ../src/config.py:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
-#: ../src/config.py:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Διπλότυπο αναγνωριστικό Jabber"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Αυτός ο λογαριασμός έχει ήδη στηθεί στο Gajim."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2906,23 +2991,23 @@ msgstr ""
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2930,196 +3015,196 @@ msgstr ""
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Ενέργειες για \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής αναζήτησης"
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 msgid "Yesterday"
 msgstr "Χθες"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "πριν από %i μέρες"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Όνομα επαφής: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "Στην ομάδα"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "Ταυτότητα κλειδιού"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Όνομα επαφής"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "Μήνυμα για κατάσταση %s"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Αποθήκευση ως προκαθορισμένο μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Εισάγετε ένα όνομα για αυτό το μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Διεύθυνση:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Διεύθυνση:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Επιπλέον οδός:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στο "
 "λογαριασμό %s"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:459
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Μεταφορές"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Μη έγκυρη ταυτότητα χρήστη"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "Το αναγνωριστικό χρήστη δεν πρέπει να περιέχει έναν πόρο."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Αυτή η επαφή υπάρχει ήδη στη λίστα επαφών σας."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "Ταυτότητα χρήστη:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "ΕΥΧΑΡΙΣΤΙΕΣ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
@@ -3127,64 +3212,73 @@ msgstr ""
 "Σταύρος Γιαννούρης <stavrosg2002@freemail.gr>\n"
 "Στάθης Καμπέρης <ekamperi@auth.gr>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Αίτηση εγγραφής για το λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική συζήτηση με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Έναρξη κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3194,258 +3288,268 @@ msgstr ""
 "θέλετε να στείλετε ένα μήνυμα συζήτησης:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Αδύνατη η εγγραφή αρχείου στο %s"
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Νέο μήνυμα"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Νέο μονό μήνυμα"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Μονό μήνυμα"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Προσαρμοσμένες Ρυθμίσεις</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Προσαρμοσμένες Ρυθμίσεις</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Επιλογή ήχου"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Αρχεία ήχου Wav"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Επιλογή εικόνας"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Όταν το %s γίνεται:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Σύνδεση"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Άλλα"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ανακάλυψη υπηρεσιών χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Ανακάλυψη υπηρεσιών"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3453,51 +3557,69 @@ msgstr ""
 "Δεν υπάρχει υπηρεσία στη διεύθυνση που εισάγατε, ή δεν ανταποκρίνεται. "
 "Ελέγξτε τη διεύθυνση και προσπαθήστε ξανά."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Η υπηρεσία δεν είναι περιηγήσιμη"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 msgid "This type of service does not contain any items to browse."
 msgstr "Αυτού του είδους η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Περιήγηση %s χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Περιήγηση"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Σάρωση %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Χρήστες"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Περιγραφή"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Εγγραφή"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Εγγραφή"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Εγγραφή"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Αρχείο"
@@ -3523,7 +3645,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "You"
 
@@ -3533,7 +3655,7 @@ msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
@@ -3600,31 +3722,31 @@ msgstr "Περιγραφή: %s"
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3660,12 +3782,11 @@ msgstr "Αρχείο:"
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
@@ -3673,31 +3794,31 @@ msgstr "Αποστολέας: "
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Το Gajim απαιτεί Xserver για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:55
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:61
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Η libglade λείπει από το GTK+"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3706,23 +3827,23 @@ msgstr ""
 "Παρακαλώ απεγκαταστήστε την τρέχουσα έκοδση του GTK+ και εγκαταστήστε την "
 "τελευταία σταθερή έκδοση από %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Παρακαλώ βεβαιωθείτε ότι το GTK+ και το PyGTK του συστήματος σας έχουν "
 "υποστήριξη για την libglade."
 
-#: ../src/gajim.py:70
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Το Gajim χρειάζεται την PySQLite2 για να εκτελεστεί"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Το Gajim χρειάζεται την PySQLite2 για να εκτελεστεί"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3730,86 +3851,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Σύνδεση"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Θέμα: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
 
-#: ../src/gajim.py:703
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Θα βλέπετε την επαφή πάντα ως αποσυνδεδεμένη."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gajim.py:748 ../src/common/connection.py:389
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "Ο %s είναι τώρα %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "H κωδική φράση είναι λανθασμένη"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3819,56 +3940,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
 
 #. ft stopped
-#: ../src/gajim.py:1294
+#: ../src/gajim.py:1366
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1307
+#: ../src/gajim.py:1379
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1383
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1413
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Η υποστήριξη για Διαχείριση συνόδων δεν είναι διαθέσιμη (δεν υπάρχει το "
@@ -3893,7 +4019,8 @@ msgid "Shows or hides the roster window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
 
 #: ../src/gajim-remote.py:82
@@ -4236,8 +4363,8 @@ msgstr "Αποτυχία αποστολής προσωπικού μηνύματ�
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
 #: ../src/groupchat_control.py:141
@@ -4254,99 +4381,100 @@ msgid "Insert Nickname"
 msgstr "Αλλαγή _ψευδώνυμου"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "Στην ομάδα"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "Ο %s είναι τώρα %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "Το %s δεν φαίνεται να είναι έγκυρο JID"
 
-#: ../src/groupchat_control.py:1181
+#: ../src/groupchat_control.py:1185
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Δεν βρέθηκε η εντολή: /%s (εάν θέλετε να το πείτε αυτό βάλτε το /say μπροστά)"
 
-#: ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Εντολές: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Χρήση: /%s <ψευδώνυμο|JID> [λόγος], απαγορεύει το JID από το δωμάτιο. Το "
 "ψευδώνυμο του χρήστη μπορεί να αντικατασταθεί, αλλά όχι εάν περιέχει \"@\". "
 "Εάν το JID είναι στο δωμάτιο, ο χρήστης θα πεταχτεί έξω επίσης. ΔΕΝ "
 "υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4354,12 +4482,12 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
 "συγκεκριμένο χρήστη."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4368,21 +4496,21 @@ msgstr ""
 "Χρήση: /%s [λόγος], κλείνει το τρέχον παράθυρο ή καρτέλα, ανακοινώνοντας το "
 "λόγο εάν έχει προσδιοριστεί."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Χρήση: /%s <JID> [λόγος], προσκαλεί το JID στο τρέχον δωμάτιο, παρέχοντας "
 "προαιρετικά και λόγο."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4391,26 +4519,26 @@ msgstr ""
 "Χρήση: /%s <δωμάτιο>@<διακομιστής>[/ψευδώνυμο], επιδιώκει την είσοδο στο "
 "δωμάτιο@διακομιστή, προαιρετικά χρησιμοποιώντας το ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 msgstr ""
 "Χρήση: /%s <ψευδώνυμο> [αιτία], βγάζει τον χρήστη που προσδιορίστηκε από το "
 "δωμάτιο, προσδιορίζοντας την αιτία. ΔΕΝ υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
 "προσώπου (π.χ. /%s χοροπηδάει)."
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4419,22 +4547,22 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο> [μήνυμα], ανοίγει ένα παράθυρο προσωπικού διαλόγου "
 "και στέλνει το μήνυμα στο χρήστη που προσδιορίστηκε."
 
-#: ../src/groupchat_control.py:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4442,71 +4570,73 @@ msgstr ""
 "Χρήση: /%s <μήνυμα>, στέλνει ένα μήνυμα χωρίς να γίνει έλεγχος για άλλες "
 "εντολές."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Δεν υπάρχουν πληροφορίες για το /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Μη_ν με ξαναρωτήσεις"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
 
-#: ../src/groupchat_control.py:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
 "κεντρικό παράθυρο."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
@@ -4537,69 +4667,69 @@ msgstr "<b>Λεπτομέρειες</b>"
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 msgid "Error parsing file:"
 msgstr "Σφάλμα κατά την ανάλυση του αρχείου:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:325
+#: ../src/gtkgui_helpers.py:334
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Αδυναμία εγγραφής στο %s. Δε θα υπάρξει υποστήριξη για το διαχειριστή "
 "συνεδριών"
 
-#: ../src/gtkgui_helpers.py:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Αποθήκευση αρχείου ως..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Δεν ήταν δυνατή η εύρεση της βάσης δεδομένων ιστορικού"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Επαφές"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Ημερομηνία"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Όνομα χρήστη"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Μήνυμα"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Θέμα"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4607,7 +4737,7 @@ msgstr ""
 "Θέλετε να καθαρίσετε τη βάση δεδομένων; (ΑΝΤΕΝΔΕΙΚΝΥΤΑΙ ΙΣΧΥΡΑ ΕΑΝ ΤΟ GAJIM "
 "ΤΡΕΧΕΙ)"
 
-#: ../src/history_manager.py:184
+#: ../src/history_manager.py:188
 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 "
@@ -4621,16 +4751,16 @@ msgstr ""
 "\n"
 "Σε περίπτωση που επιλέξατε ΝΑΙ, παρακαλώ περιμένετε..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Εξαγωγή ιστορικού..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "Ο %(who)s είπε στις %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:510
+#: ../src/history_manager.py:514
 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] ""
@@ -4638,11 +4768,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Θέλετε σίγουρα να διαγράψετε τα αρχεία καταγραφής των επιλεγμένων επαφών;"
 
-#: ../src/history_manager.py:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Αυτή η ενέργεια δεν είναι αναστρέψιμη."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
@@ -4673,11 +4803,11 @@ msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4717,48 +4847,48 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Παραλήφθηκε μια πρόσκληση"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
 "σας"
 
-#: ../src/profile_window.py:327
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4766,89 +4896,90 @@ msgstr ""
 "Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
 "δοκιμάστε αργότερα."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να λάβετε τις πληροφορίες της επαφής σας"
 
-#: ../src/roster_window.py:144 ../src/roster_window.py:196
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../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"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "με χρήση του λογαριασμού %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "στο λογαριασμό %s"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Διαχείριση σελιδοδεικτών..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "για το λογαριασμό %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Είσοδος σε Ομαδική Συζήτηση"
 
-#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
-#: ../src/roster_window.py:3027
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr ""
 "Ανάγνωση όλων των γενονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/roster_window.py:1262
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4856,12 +4987,12 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4870,73 +5001,123 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Επαφές"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Πληκτρολογήστε την κωδικοφράση GPG για το λογαριασμό %s"
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Μετονομασία"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Πληκτρολογήστε την κωδικοφράση GPG για το λογαριασμό %s"
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Αφαίρεση"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Νέο δωμάτιο"
+msgid "_New group chat"
+msgstr "Ομαδική συζήτηση"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Νέο Μήνυμα"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "_Μετονομασία"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "_Συνδεδεμένοι Χρήστες"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Σύνδεση"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Αποσύνδεση"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: ../src/roster_window.py:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4944,7 +5125,7 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4952,17 +5133,17 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4971,32 +5152,32 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:2411
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Απαιτείται κωδικοφράση"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Πληκτρολογήστε την κωδικοφράση GPG για το λογαριασμό %s"
 
-#: ../src/roster_window.py:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Αποθήκευση της κωδικοφράσης"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Εσφαλμένη κωδικοφράση"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Παρακαλώ εισάγετε ξανά την κωδική φράση GPG σας, ή επιλέξτε Ακύρωση."
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -5004,22 +5185,22 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: ../src/roster_window.py:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -5027,111 +5208,136 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
+"άλλες επαφές."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Αφαίρεση %s από την ομάδα %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Αλλαγή μηνύματος κατάστασης..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "Αλλαγή μηνύματος _κατάστασης..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Ρόλος: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Απόκρυψη αυτού του μενού"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Συσχέτιση: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Πόρος: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Κατάσταση: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Τελευταία κατάσταση στο %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "από τις %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Εγγραφή: "
+
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Λήψη"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Τύπος: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Μεταφέρθηκαν: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Δεν έχει ξεκινήσει"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Πάγωσε"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Μεταφέρεται"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Αυτή η υπηρεσία δεν έχει απαντήσει ακόμα με λεπτομερείς πληροφορίες"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5139,25 +5345,25 @@ msgstr ""
 "Αυτή η υπηρεσία δεν μπόρεσε να απαντήσει με λεπτομερείς πληροφορίες.\n"
 "Είναι είτε χαλασμένη είτε πεπαλαιωμένη."
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?Λειτ. Σύστημα: Άγνωστο"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "από τις %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Συσχέτιση: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5165,7 +5371,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5173,12 +5379,12 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
 #. None
-#: ../src/vcard.py:271
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5186,125 +5392,125 @@ msgstr ""
 "Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η "
 "ενδιαφέρεται για εσάς"
 
-#: ../src/vcard.py:279
+#: ../src/vcard.py:299
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
 
-#: ../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:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Το Gajim τώρα θα κλείσει"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "δημιουργία φακέλου %s"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Χρήση του D-Bus και του δαίμονα ειδοποιήσεων για εμφάνιση ειδοποιήσεων"
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε "
 "απομακρυσμένος."
 
-#: ../src/common/config.py:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Απομακρυσμένος λόγω αδράνειας"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε μη "
 "διαθέσιμος."
 
-#: ../src/common/config.py:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Μη διαθέσιμος λόγω αδράνειας"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Τα ζεύγη * / _ είναι χαρακτήρες μορφοποίησης."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Αν είναι αληθές, μην αφαιρείς */_. Έτσι το *αβγ* θα είναι μεν έντονο αλλά τα "
 "* * δεν θα αφαιρεθούν."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Να προστεθεί * και [n] στον τίτλο της λίστας επαφών;"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5312,12 +5518,12 @@ msgstr ""
 "Πόσες γραμμές από την προηγούμενη συζήτηση θα εμφανίζονται όταν θα "
 "ξανανοίξει μια καρτέλα/παράθυρο κουβέντας."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Πόσα λεπτά θα παραμείνουν οι τελευταίες γραμμές από την προηγούμενη συζήτηση."
 
-#: ../src/common/config.py:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5325,11 +5531,11 @@ msgstr ""
 "Αποστολή μηνύματος με Ctrl+Enter και εισαγωγή νέας γραμμής με το Enter (Εξ "
 "ορισμού συμπεριφορά του πελάτη ICQ της Mirabilis)."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Πόσες γραμμές να αποθηκευτούν για το Ctrl+KeyUP."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5338,7 +5544,7 @@ msgstr ""
 "Είτε δικό σας url με ένα %s σε αυτό όπου %s είναι η λέξη/φρράση ή "
 "'WIKTIONARY' που σημαίνει να γίνεται χρήση του wiktionary."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:153
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Εαν είναι επιλεγμένο, το Gajim μπορεί να ελεγχθεί από μακριά χρησιμοποιόντας "
@@ -5346,31 +5552,52 @@ msgstr ""
 
 #: ../src/common/config.py:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Να γίνεται πάντα ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Να μην γίνεται ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5378,31 +5605,35 @@ msgstr ""
 "Προέχει του κεντρικού υπολογιστή που αποστέλουμε για Μεταφορές Αρχείων σε "
 "περίπτωση που υπάρχει μετάφραση διεύθυνσης/προώθηση πόρτας."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Να εμφανίζεται καρτέλα όταν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Να εμφανίζεται καρτέλα εάν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5411,11 +5642,11 @@ msgstr ""
 "παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου "
 "στην μπάρα ειδοποιήσεων."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Αν είναι αληθές, το Gajim καταχωρείται στο xmpp:// σε κάθε έναρξη του."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5424,7 +5655,7 @@ msgstr ""
 "έχει μη αναγνωσμένα μηνύματα. Σε μερικά θέματα, αυτό το εικονίδιο έχει "
 "κίνηση."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5433,7 +5664,7 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν "
 "είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5441,7 +5672,7 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα κοιτάει αν κάθε επαφή που δεν είχε ως τώρα "
 "άβαταρ, έχει τώρα ή έχει αλλά είναι πεπαλαιωμένη."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5451,29 +5682,37 @@ msgstr ""
 "παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μήνυμα "
 "κατάστασης."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5482,17 +5721,18 @@ msgstr ""
 "Αν είναι ενεργοποιημένο, και τα GTK+ και PyGTK είναι έκδοσης 2.8 και πάνω, "
 "να αναβοσβήνει το παράθυρο όταν υπάρχουν εκκρεμή γεγονότα."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5510,68 +5750,83 @@ msgstr ""
 "'κατατύπο' - Κάθε τύπος μηνύματος έχει το δικό του παράθυρο. Αυτή η επιλογή "
 "απαιτεί επανεκκίνηση του gajim για να εφαρμοστεί."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:212
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Αν Αληθές, πατώντας το πλήκτρο διαφυγής, κλείνει η καρτέλα/το παράθυρο."
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "Αποκρύπτει τα κουμπιά στο παράθυρο προσωπικού διαλόγου"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Αποκρύπτει την κεφαλίδα στο παράθυρο προσωπικής κουβέντας"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "Αποκρύπτει τη λίστα συμμετεχόντων στο παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Ειδική παράκαμψη για το jabberd2"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5580,151 +5835,148 @@ msgstr ""
 "διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
 "αρχείων."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:326
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/common/config.py:318 ../src/common/config.py:321
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Είμαι έξω στη ζωή"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Διαθέσιμος"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Η υπηρεσία δεν είναι διαθέσιμη"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: ../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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 msgstr ""
-"Ο ήχος που θα παιχθεί όταν ληφθεί οποιοδήποτε μήνυμα MUC. (Αυτή η ρύθμιση "
-"ισχύει μόνο εάν είναι ορισμένη η notify_on_all_muc_messages)"
 
-#: ../src/common/config.py:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "πράσινο"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "μανάβικο"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "ζεστό"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "θαλασσί"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Εσφαλμένη κωδικοφράση"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5737,49 +5989,54 @@ msgstr ""
 "Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
 "%s"
 
-#: ../src/common/connection_handlers.py:1449
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτό το δωμάτιο."
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτό το δωμάτιο."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Δεν υπάρχει τέτοιο δωμάτιο."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "Δεν επιτρέπεται η δημιουργία δωματίων."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Δεν είστε στη λίστα μελών."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5787,27 +6044,27 @@ msgstr ""
 "Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
 "Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Ο %s μόλις σας εξουσιοδότησε"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5817,90 +6074,87 @@ msgstr ""
 "σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru."
 "jabberstudio.org για να το αφαιρέσετε"
 
-#: ../src/common/connection.py:162
-#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
-"επανασυνδεθείτε."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Μη έγκυρη απόκριση"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Έγινε σύνδεση με το διακομιστή %s:%s με %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "Δε δόθηκε κωδική-φράση για το OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "αόρατος"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "αποσυνδεδεμένος"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "Είμαι %s"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5909,16 +6163,16 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Δεν υπάρχει υποστήριξη D-Bus για την python σε αυτόν τον υπολογιστή"
 
-#: ../src/common/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Οι δυνατότητες του Gajim για D-Bus δε θα χρησιμοποιηθούν"
 
@@ -6109,242 +6363,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Απαιτείται η διεύθυνση του διακομιστή."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "Απα_σχολημένος"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Μη διαθέσιμος"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "Διαθέσιμος για _κουβέντα"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Διαθέσιμος"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Διαθέσιμος"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "Α_πομακρυσμένος"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "Αόρατ_ος"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "?κατάσταση επαφής: Άγνωστη"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "Καμία"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Προς"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Από"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "Τίποτα"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Διαχειριστές"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Συμμετέχοντες"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Συμμετέχων"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Επισκέπτες"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Επισκέπτης"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Ιδιοκτήτης"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Διαχειριστής"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Μέλος"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 msgid "is composing a message..."
 msgstr "γράφει ένα μήνυμα..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6355,50 +6609,117 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "κυανό"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "για τον λογαριασμό %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Η σύνδεση με τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
+"επανασυνδεθείτε."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, fuzzy
 msgid "Could not start local service"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Εγγραφή"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Νέο δωμάτιο"
+
+#~ msgid "Role: "
+#~ msgstr "Ρόλος: "
+
+#~ msgid "Affiliation: "
+#~ msgstr "Συσχέτιση: "
+
+#~ msgid ""
+#~ "Sound to play when any MUC message arrives. (This setting is taken into "
+#~ "account only if notify_on_all_muc_messages is True)"
+#~ msgstr ""
+#~ "Ο ήχος που θα παιχθεί όταν ληφθεί οποιοδήποτε μήνυμα MUC. (Αυτή η ρύθμιση "
+#~ "ισχύει μόνο εάν είναι ορισμένη η notify_on_all_muc_messages)"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6420,10 +6741,6 @@ msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 #~ msgid "Not Available "
 #~ msgstr "Μη διαθέσιμος"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Διαγραφή"
-
 #~ msgid "Contact _Info"
 #~ msgstr "Πλη_ροφορίες επαφής"
 
@@ -6454,9 +6771,6 @@ msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 #~ 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 μη αναγνωσμένο μήνυμα"
@@ -6612,9 +6926,6 @@ msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 #~ "Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή "
 #~ "γνωστοποίησης"
 
-#~ msgid "_Online Users"
-#~ msgstr "_Συνδεδεμένοι Χρήστες"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Έναργξη Κουβέντας με χρήση του λογαριασμού %s"
@@ -6762,10 +7073,6 @@ msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 #~ msgid "Chat with"
 #~ msgstr "Κουβέντα με"
 
-#, fuzzy
-#~ msgid "Send New Message"
-#~ msgstr "Νέο Μήνυμα"
-
 #~ msgid "as %s"
 #~ msgstr "ως %s"
 
diff --git a/po/eo.po b/po/eo.po
index 9ed59b454..28cc95702 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-01 14:53+0100\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-10-25 22:02+0500\n"
 "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -43,21 +43,25 @@ msgid "_Discover Services..."
 msgstr "_Serĉi servojn..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Babilejo"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Korekti konton..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 msgid "_Open Gmail Inbox"
 msgstr "_Malfermi poŝtkeston de Gmail"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stato"
@@ -242,16 +246,18 @@ msgid "Edit Personal Information..."
 msgstr "Korekti personan informon..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:899
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:304 ../src/roster_window.py:1323
-#: ../src/roster_window.py:1825
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Ĝenerala"
 
@@ -310,17 +316,17 @@ msgid "Manage..."
 msgstr "Administri..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1594
-#: ../src/config.py:3353
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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:1183
-#: ../src/config.py:1188 ../src/config.py:1369 ../src/config.py:1584
-#: ../src/config.py:1593 ../src/config.py:1652 ../src/config.py:1725
-#: ../src/config.py:2580 ../src/config.py:3343 ../src/config.py:3352
-#: ../src/dialogs.py:280 ../src/dialogs.py:282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Neniu"
 
@@ -603,11 +609,12 @@ msgid "Advanced Notifications Control"
 msgstr "Kroma agordo de avizado"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
-msgid "All Status "
+#, fuzzy
+msgid "All statuses"
 msgstr "Ĉiustate "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Fora"
 
@@ -624,7 +631,7 @@ msgid "Have "
 msgstr "Havas "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Nevidebla"
 
@@ -633,19 +640,24 @@ msgid "Launch a command"
 msgstr "Lanĉi komandon"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Nedisponebla"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+#, fuzzy
+msgid "One or more special statuses..."
+msgstr "Kelka(j) speciala(j) stato(j)..."
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 msgid "Online / Free For Chat"
 msgstr "Enrete / Babilema"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid "Play a sound"
 msgstr "Ludi sonon"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -667,16 +679,14 @@ msgstr ""
 "Dosiertransmeto komencis\n"
 "Dosiertransmeto finis"
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr "Kelka(j) speciala(j) stato(j)..."
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr "Kiam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+#, fuzzy
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 "_Aktivigi fenestragordilan urgkonsileton \"UrgencyHint\" por briligi "
 "taskostrion"
@@ -736,7 +746,8 @@ msgid "for "
 msgstr "por "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+#, fuzzy
+msgid "when I'm in"
 msgstr "dum mi estas "
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -770,7 +781,7 @@ msgstr "Eniri en babilejon"
 #: ../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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Aldoni al kontaktlisto"
 
@@ -793,7 +804,7 @@ msgstr "_Malfermi ligilon per retrigardilo"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Ekparoli"
 
@@ -802,7 +813,7 @@ msgid "Click to see past conversations with this contact"
 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/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Sendi _dosieron"
@@ -819,12 +830,17 @@ msgstr "_Kompakta vido    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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historio"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "ĉiuj en la grupo"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Agordo de babilejo"
 
@@ -911,11 +927,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Koloroj de babilstataj langetoj</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Konto\n"
 "Grupo\n"
@@ -966,7 +983,7 @@ msgstr ""
 "Babilejaj\n"
 "mesaĝoj al vi"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:602
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Paŭzas"
 
@@ -1106,14 +1123,14 @@ msgstr "Rifuzi"
 msgid "Invitation Received"
 msgstr "Invito estas ricevita"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1136
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 msgid "Join Group Chat"
 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:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Kaŝnomo:"
 
@@ -1131,8 +1148,8 @@ msgstr "Antaŭ nelonge:"
 msgid "Room:"
 msgstr "Babilejo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Aliĝi"
 
@@ -1182,7 +1199,7 @@ msgstr "Administri prokurservilajn agordojn"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Nomo:"
 
@@ -1198,14 +1215,14 @@ msgstr "Uzi aŭtentokontrolon"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klaku por enigi mienon (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 msgid "OpenPGP Encryption"
 msgstr "Ĉifrado per 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Agoj"
 
@@ -1323,15 +1340,11 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Antaŭ kaŝnomo:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Babilejo"
 
 #: ../data/glade/preferences_window.glade.h:31
-msgid "Chat state noti_fications:"
-msgstr "Avizi:"
-
-#: ../data/glade/preferences_window.glade.h:32
 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 "
@@ -1341,6 +1354,10 @@ msgstr ""
 "Uzi singarde, ĉar tio blokas ĉiujn mesaĝojn de ĉiuj kontaktoj kiuj mankas en "
 "via kontaktlisto"
 
+#: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
 #: ../data/glade/preferences_window.glade.h:33
 msgid "Default Status Messages"
 msgstr "Defaŭlta statmesaĝo"
@@ -1362,18 +1379,34 @@ msgid "Display status _messages of contacts in roster"
 msgstr "Montri statmesaĝojn de kontaktoj en kontaktlisto"
 
 #: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Avizi:"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "Ĉiujn 5 _minutojn"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Mienoj:"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Eventoj"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim povas sendi kaj ricevi informon rilatan al interparolado kun kontakto. "
+"Tie ĉi vi povas specifi pri kiuj babilstatoj vi volas mesaĝi al "
+"interparolanto."
+
+#: ../data/glade/preferences_window.glade.h:43
 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 "
@@ -1383,13 +1416,13 @@ msgstr ""
 "Tie ĉi vi povas specifi pri kiuj babilstatoj vi volas mesaĝi al "
 "interparolanto."
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Gajim aŭtomate montros novajn eventojn antaŭigante la adekvatan fenestron"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1397,7 +1430,7 @@ msgstr ""
 "Gajim avizos vin pri novaj eventoj per ŝprucfenestro en la malsupra dekstra "
 "angulo de la ekrano"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1405,7 +1438,7 @@ msgstr ""
 "Gajim avizos vin per ŝprucfenestro en la malsupra dekstra angulo de la "
 "ekrano pri kontaktoj kiu ĵus ensalutis"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1413,19 +1446,19 @@ msgstr ""
 "Gajim avizos vin per ŝprucfenestro en la malsupra dekstra angulo de la "
 "ekrano pri kontaktoj kiu ĵus elsalutis"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim nur ŝanĝos la piktogramon de la kontakto, kiu okazigis novan eventon"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1433,7 +1466,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1441,7 +1474,7 @@ msgstr ""
 "Se markitas, Gajim montros statmesaĝojn de kontaktoj sub la kontaktnomo en "
 "la kontaktlisto kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1449,7 +1482,7 @@ msgstr ""
 "Se markitas, Gajim memoros la kontaktlista kaj interparola lokoj sur la "
 "ekrano kaj la ĝia dimensioj je sekva lanĉo."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1459,7 +1492,7 @@ msgstr ""
 "kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
 "fora, okupata ktp...)"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1467,15 +1500,15 @@ msgstr ""
 "Se ne malŝaltita, Gajim anstataŭigas ASCII mienojn, kiel \":)\", per "
 "ekvivalentaj animaciataj aŭ statikaj grafikaj mienoj"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid "Ignore rich content in incoming messages"
 msgstr "Ignori fomaton en aliraj mesaĝoj"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "Admi_nistri..."
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1487,56 +1520,61 @@ msgstr ""
 "Perkonte\n"
 "Perspece"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Notify on new _GMail email"
 msgstr "Avizi pri novaj _Gmail-leteroj"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "En ĉiu _mesaĝo"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "_Unu mesaĝfenestro:"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Avizi:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Ludi sonojn"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Agordo"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Eligi tempon:"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Konservi _lokon kaj grandecon de kontaktlista kaj interparola fenestroj"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr "Starigi statmesaĝon por reflekti kurantan ludantan _muzikaĵon"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Montri nur en _kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "E_nsalutas"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "E_lsalutas"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:75
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1544,35 +1582,35 @@ msgstr ""
 "Iuj mesaĝoj povas enteni tekstatributojn (aranĝo, koloro k.t.p.). Se "
 "markitas, Gajim simple montros krudan mesaĝan tekston."
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "_Etoso:"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "La aŭtomate fora statmesaĝo"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "La aŭtomate nedisponebla statmesaĝo"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Uzi _transportilajn piktogramarojn"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr "Uzi sisteman defaŭlton"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Uzi pletpiktogramon"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1584,11 +1622,11 @@ msgstr ""
 "eventoj pri novaj mesaĝoj okazas nur se ĝi estas mesaĝo de kontakto kun kiu "
 "vi ankoraŭ ne parolas"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Kiam ricevas novan eventon"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:85
 msgid ""
 "Works for Rhythmbox and Muine players. For more players, please visit http://"
 "trac.gajim.org/wiki/GajimAndMusicPlayer"
@@ -1596,94 +1634,98 @@ msgstr ""
 "Funkcias por la ludiloj Rhythmbox kaj Muine. Por aliaj ludiloj, bonvolu "
 "viziti http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Advanced Notifications Control..."
 msgstr "_Kroma agordo de avizado..."
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_Post tempo:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "_Antaŭ tempo:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Rigardilo:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Dosieradministrilo:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Tiparo:"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Emfazi misskribajn vortojn"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "E_nira mesaĝo:"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "Ret_poŝtkliento:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Neniam"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Avizi min pri tio"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Malfermi..."
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "E_lira mesaĝo:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Ludilo:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Antaŭigi la fenestron"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "_Reŝargi kolorojn per defaŭlto"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "_Ordigi kontaktojn per stato"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "_Statmesaĝo:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minutoj"
 
+#: ../data/glade/privacy_lists_window.glade.h:1
+msgid "Privacy Lists:"
+msgstr "Privataj listoj:"
+
 #: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Aldoni / Redakti regulon</b>"
@@ -1704,7 +1746,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:2579
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr "Ĉiuj"
 
@@ -1720,7 +1762,7 @@ msgstr "Jabber-ID"
 msgid "Order:"
 msgstr "Ordnumero:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1817
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr "Privata listo"
 
@@ -1760,10 +1802,6 @@ msgstr "sendi staton al mi"
 msgid "to view my status"
 msgstr "vidi mian staton"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
-msgid "Privacy Lists:"
-msgstr "Privataj listoj:"
-
 #. "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
@@ -1790,115 +1828,115 @@ msgid "City:"
 msgstr "Urbo:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Kompanio:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Lando:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Fako:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../data/glade/zeroconf_information_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "Retpoŝtadreso:"
 
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Kroma adreso:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "Family:"
 msgstr "Familia nomo:"
 
 #. 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Nomo:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Hejmpaĝo:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Meznomo:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Plu"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Personal Info"
 msgstr "Persona informo"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefono:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Ofico:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Poŝtkodo:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Prefikso:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:259
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Rolo:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Ŝtato:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Strato:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Sufikso:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Laboro"
 
@@ -1938,45 +1976,52 @@ msgstr "Enigi Open_PGP-ŝlosilon"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Aranĝi _Grupojn"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1762
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:1954
 msgid "In_vite to"
 msgstr "In_viti al"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Sendi unuopan _mesaĝon"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Ekparoli"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "_Allow him/her to see my status"
 msgstr "_Permesi al li/ŝi vidi vian staton"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 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:1756 ../src/roster_window.py:1903
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Forigi el kontaktlisto"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1891
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Renomigi"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Abono"
 
@@ -2020,8 +2065,8 @@ msgstr "_Enhavo"
 msgid "_Discover Services"
 msgstr "_Serĉi servojn"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1883
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "A_dministri"
 
@@ -2110,35 +2155,41 @@ msgid "_Send & Close"
 msgstr "_Sendi kaj fermi"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Permesi"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Permesi al kontakto koni kiam vi konektas"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Rifuzi abonon de kontakto, do li aŭ ŝi ne povos scii kiam vi estas konektita"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Mendo de abono"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Permesi"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Rifuzi"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Wav-sonoj"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Montri ĉiujn nelegitajn _eventojn"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Montri _kontaktliston"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_to"
 
@@ -2151,37 +2202,42 @@ msgstr "Demandas:"
 msgid "Client:"
 msgstr "Kliento:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Komento: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakto"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:415
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Risurco:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stato:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Abono:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Protokoli komunikadan historion"
@@ -2368,7 +2424,7 @@ msgstr "Sveda"
 msgid "Chinese (Ch)"
 msgstr "Ĉina (Ch)"
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1478
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2397,49 +2453,49 @@ msgstr "Konekto mankas"
 msgid "Your message can not be sent until you are connected."
 msgstr "Via mesaĝo ne povas esti sendita dum vi senkonektas."
 
-#: ../src/chat_control.py:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Babilejoj"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "Nek %s publicis OpenPGP-ŝlosilon, nek vi enigis ĝin"
 
-#: ../src/chat_control.py:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Ĉifrado ebligata"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Ĉifrado malebligata"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1381 ../src/conversation_textview.py:490
-#: ../src/dialogs.py:628 ../src/gajim.py:680 ../src/gajim.py:681
-#: ../src/gajim.py:1011 ../src/roster_window.py:290
-#: ../src/roster_window.py:1472 ../src/roster_window.py:1631
-#: ../src/roster_window.py:2134 ../src/roster_window.py:2336
-#: ../src/roster_window.py:2347 ../src/roster_window.py:2711
-#: ../src/roster_window.py:2767 ../src/roster_window.py:3607
-#: ../src/roster_window.py:3609 ../src/common/contacts.py:73
-#: ../src/common/helpers.py:42 ../src/common/helpers.py:244
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Mankas en kontaktlisto"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2447,29 +2503,29 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: ../src/config.py:127 ../src/config.py:570
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "malŝaltitaj"
 
-#: ../src/config.py:209
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Ĉiujn %s _minutojn"
 
-#: ../src/config.py:340
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Aktiva"
 
-#: ../src/config.py:348
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:660 ../src/gajim.py:1994
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: ../src/config.py:661 ../src/gajim.py:1995
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2478,238 +2534,243 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/config.py:1004
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
-#: ../src/config.py:1004
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "statmesaĝa teksto"
 
-#: ../src/config.py:1039
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Unua mesaĝo ricevita"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:1041
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Kontakto konektita"
 
-#: ../src/config.py:1042
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: ../src/config.py:1043
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Mesaĝo sendita"
 
-#: ../src/config.py:1044
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Invito estas ricevita"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/config.py:1291
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
 
-#: ../src/config.py:1292
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:1295 ../src/config.py:1879
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Nelegitaj eventoj"
 
-#: ../src/config.py:1296
+#: ../src/config.py:1333
 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:1300
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Kontnomo jam estas uzata"
 
-#: ../src/config.py:1301
+#: ../src/config.py:1338
 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:1305 ../src/config.py:1309
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/config.py:1306
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Kontnomo ne povas esti malplena."
 
-#: ../src/config.py:1310
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
 
-#: ../src/config.py:1318 ../src/config.py:1324 ../src/config.py:1333
-#: ../src/config.py:2966
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/config.py:1325
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber-ID devas esti en la formo \"uzulo@servilnomo\"."
 
-#: ../src/config.py:1383
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:1384
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: ../src/config.py:1507 ../src/common/config.py:358
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
-#: ../src/config.py:1517
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Ĉu rekonektu nun?"
 
-#: ../src/config.py:1518
+#: ../src/config.py:1559
 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:1544
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
 
-#: ../src/config.py:1545
+#: ../src/config.py:1586
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaŭ korekti vian personan informon."
 
-#: ../src/config.py:1551 ../src/dialogs.py:1118 ../src/dialogs.py:1282
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/config.py:1552
+#: ../src/config.py:1594
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
 
-#: ../src/config.py:1556
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: ../src/config.py:1557
+#: ../src/config.py:1599
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
 
-#: ../src/config.py:1581 ../src/config.py:3340
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
 
-#: ../src/config.py:1582 ../src/config.py:3341
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
 
-#: ../src/config.py:1585 ../src/config.py:3344
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/config.py:1586 ../src/config.py:3345
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
 
 #. Name column
-#: ../src/config.py:1815 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/config.py:1818
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Servilo"
 
-#: ../src/config.py:1880
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
 
-#: ../src/config.py:1915
+#: ../src/config.py:1962
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vi havas aktivan konversacion ĉe konto %s"
 
-#: ../src/config.py:1916
+#: ../src/config.py:1963
 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:1971
+#: ../src/config.py:2022
 msgid "Account Local already exists."
 msgstr "Loka konto jam ekzistas."
 
-#: ../src/config.py:1971
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Bonvolu renomigi aŭ forigi ĝin antaŭ ebligi lig-lokan komunikadon."
 
-#: ../src/config.py:2197
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
 
 #. list at the begining
-#: ../src/config.py:2270
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
 
-#: ../src/config.py:2271
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Membra listo"
 
-#: ../src/config.py:2272
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Listo de mastroj"
 
-#: ../src/config.py:2273
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Estra listo"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2306 ../src/disco.py:743 ../src/history_manager.py:154
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2314
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Kialo"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../src/config.py:2323
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Rolo"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Malpermesas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2346
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2717,11 +2778,11 @@ msgstr ""
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
 
-#: ../src/config.py:2348
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Aligas membron..."
 
-#: ../src/config.py:2349
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2729,11 +2790,11 @@ msgstr ""
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2351
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
 
-#: ../src/config.py:2352
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2741,11 +2802,11 @@ msgstr ""
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
 
-#: ../src/config.py:2354
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2753,7 +2814,7 @@ msgstr ""
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2769,89 +2830,99 @@ msgstr ""
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aŭ subdomajno)."
 
-#: ../src/config.py:2461
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
 
-#: ../src/config.py:2478 ../src/roster_window.py:2400
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: ../src/config.py:2479 ../src/roster_window.py:2401
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: ../src/config.py:2480 ../src/roster_window.py:2402
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: ../src/config.py:2493
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/config.py:2494
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: ../src/config.py:2580
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Forigi"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Eligi staton:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr "Nur en/el-irado"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2709
 msgid "New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/config.py:2681
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
 
-#: ../src/config.py:2682
+#: ../src/config.py:2742
 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:2942
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:2943
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
 
-#: ../src/config.py:2952 ../src/dialogs.py:1301
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
 
-#: ../src/config.py:2953
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Vi devas enigi pasvorton por la nova konto."
 
-#: ../src/config.py:2957 ../src/dialogs.py:1306
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: ../src/config.py:2958 ../src/dialogs.py:1307
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
 
-#: ../src/config.py:2977
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Ripeta Jabber-ID"
 
-#: ../src/config.py:2978
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Tiu ĉi konto jam ĉeestas en kontlisto de Gajim."
 
-#: ../src/config.py:2995
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: ../src/config.py:2996 ../src/config.py:3029
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2859,23 +2930,23 @@ 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:3028
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/config.py:3044
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: ../src/config.py:3101
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: ../src/config.py:3102
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2883,52 +2954,52 @@ msgstr ""
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:340
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Agoj por \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 msgid "Look it up in _Dictionary"
 msgstr "Serĉi tion en _vortaro"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:373
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Vortara URL ne enhavas \"%s\" kaj ĝi ne estas WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Retserĉila URL ne enhavas \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "Antaŭ %i tagoj"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
@@ -2939,8 +3010,8 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktnomo: <i>%s</i>"
 
 #: ../src/dialogs.py:61
-#, python-format
-msgid "JID: <i>%s</i>"
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
 #: ../src/dialogs.py:211
@@ -2959,123 +3030,123 @@ msgstr "Ŝlosil-ID"
 msgid "Contact name"
 msgstr "Kontaktnomo"
 
-#: ../src/dialogs.py:317
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "Mesaĝo por la stato \"%s\""
 
-#: ../src/dialogs.py:319
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Konservi kiel antaŭpreparita statmesaĝo"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Bonvolu tajpi nomon de tiu statmesaĝo"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:417
 msgid "AIM Address:"
 msgstr "AIM-adreso:"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr "GG numero:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr "ICQ numero:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:420
 msgid "MSN Address:"
 msgstr "MSN-adreso:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:421
 msgid "Yahoo! Address:"
 msgstr "Yahoo-adreso:"
 
-#: ../src/dialogs.py:456
+#: ../src/dialogs.py:457
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni ĉe konto %s"
 
-#: ../src/dialogs.py:458
+#: ../src/dialogs.py:459
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
-#: ../src/dialogs.py:466 ../src/disco.py:100 ../src/disco.py:101
-#: ../src/disco.py:1248 ../src/roster_window.py:231
-#: ../src/roster_window.py:287 ../src/roster_window.py:323
-#: ../src/roster_window.py:375 ../src/roster_window.py:398
-#: ../src/roster_window.py:400 ../src/roster_window.py:3603
-#: ../src/roster_window.py:3605 ../src/common/helpers.py:42
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportiloj"
 
-#: ../src/dialogs.py:608 ../src/dialogs.py:614
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Malkorekta uzula ID"
 
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "La uzula ID devas ne enteni risurcon."
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Tiu kontakto jam ĉeestas en via kontaktlisto."
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:665
 msgid "User ID:"
 msgstr "Uzula ID:"
 
-#: ../src/dialogs.py:727
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber-kliento"
 
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr "Versio de GTK+:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr "Versio de PyGTK:"
 
-#: ../src/dialogs.py:743
+#: ../src/dialogs.py:744
 msgid "Current Developers:"
 msgstr "Nunaj programistoj:"
 
-#: ../src/dialogs.py:745
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Ĝisnunaj programistoj:"
 
-#: ../src/dialogs.py:755
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "DANKON AL:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:761
+#: ../src/dialogs.py:762
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Fine ne malpli ol aliajn ni dankas ĉiujn pakaĵvartistojn."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:775
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:906
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Neeblas aliĝi al pordo %s."
 
-#: ../src/dialogs.py:906
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
@@ -3083,57 +3154,57 @@ msgstr ""
 "Eble vi havas alian ekzempleron kiu estas plenumata nun. Dosiertransmeto "
 "estos nuligita."
 
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Demando pri abono por konto %s de %s"
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Demando pri abono de %s"
 
-#: ../src/dialogs.py:1111 ../src/roster_window.py:602
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1129
 msgid "You can not join a group chat unless you are connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: ../src/dialogs.py:1134
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Eniri en babilejon per konto %s"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 msgid "Invalid group chat Jabber ID"
 msgstr "Malkorekta babileja jabber-ID"
 
-#: ../src/dialogs.py:1204
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1225
 msgid "This is not a group chat"
 msgstr "Tio ne estas babilejo"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1226
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ne estas la nomo de babilejo."
 
-#: ../src/dialogs.py:1233
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Babili per konto %s"
 
-#: ../src/dialogs.py:1235
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Babili"
 
-#: ../src/dialogs.py:1236
+#: ../src/dialogs.py:1251
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3142,260 +3213,260 @@ msgstr ""
 "al kiu vi volas sendi mesaĝon:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1261 ../src/dialogs.py:1616 ../src/dialogs.py:1740
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
-#: ../src/dialogs.py:1262 ../src/dialogs.py:1617 ../src/dialogs.py:1741
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: ../src/dialogs.py:1271 ../src/dialogs.py:1274
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 msgid "Invalid JID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/dialogs.py:1274
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Neeblas analizi \"%s\"."
 
-#: ../src/dialogs.py:1283
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Vi devas enigi pasvorton."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1349 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Kontakto ensalutis"
 
-#: ../src/dialogs.py:1351 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Kontakto elsalutis"
 
 #. chat message
-#: ../src/dialogs.py:1353 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nova mesaĝo"
 
 #. single message
-#: ../src/dialogs.py:1353 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nova unuobla mesaĝo"
 
 #. private message
-#: ../src/dialogs.py:1354 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Nova privata mesaĝo"
 
-#: ../src/dialogs.py:1354 ../src/gajim.py:1104 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: ../src/dialogs.py:1356 ../src/gajim.py:1238 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/dialogs.py:1358 ../src/gajim.py:1078 ../src/gajim.py:1214
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: ../src/dialogs.py:1360 ../src/gajim.py:1274 ../src/gajim.py:1296
-#: ../src/gajim.py:1313 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: ../src/dialogs.py:1361 ../src/gajim.py:1277 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/dialogs.py:1363 ../src/gajim.py:976 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Babileja invitilo"
 
-#: ../src/dialogs.py:1365 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 msgid "Contact Changed Status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: ../src/dialogs.py:1546
+#: ../src/dialogs.py:1565
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Unuopa mesaĝo per konto %s"
 
-#: ../src/dialogs.py:1548
+#: ../src/dialogs.py:1567
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Unuopa mesaĝo ĉe konto %s"
 
-#: ../src/dialogs.py:1550
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Unuopa mesaĝo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1553
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Sendi %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1576
+#: ../src/dialogs.py:1595
 #, python-format
 msgid "Received %s"
 msgstr "Ricevitas %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1643
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1644
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
 
-#: ../src/dialogs.py:1688
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konzolo por %s"
 
-#: ../src/dialogs.py:1690
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "XML-konzolo"
 
-#: ../src/dialogs.py:1811
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privata listo <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1815
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privata listo por %s"
 
-#: ../src/dialogs.py:1863
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr "Ordnumero: %s, ago: %s, tipo: %s, valoro: %s"
 
-#: ../src/dialogs.py:1866
+#: ../src/dialogs.py:1890
 #, python-format
 msgid "Order: %s, action: %s"
 msgstr "Ordnumero: %s, ago: %s"
 
-#: ../src/dialogs.py:1908
+#: ../src/dialogs.py:1932
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redakti regulon</b>"
 
-#: ../src/dialogs.py:1995
+#: ../src/dialogs.py:2019
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aldoni regulon</b>"
 
-#: ../src/dialogs.py:2091
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privataj listoj por %s"
 
-#: ../src/dialogs.py:2093
+#: ../src/dialogs.py:2117
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2185
 msgid "Invalid List Name"
 msgstr "Malkorekta listnomo"
 
-#: ../src/dialogs.py:2162
+#: ../src/dialogs.py:2186
 msgid "You must enter a name to create a privacy list."
 msgstr "Vi devas enigi nomon por krei privatan liston."
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2196
+#: ../src/dialogs.py:2220
 #, python-format
 msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s invitas vin al la babilejo %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2202
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
 
-#: ../src/dialogs.py:2264
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Elektu sonon"
 
-#: ../src/dialogs.py:2274 ../src/dialogs.py:2319
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/dialogs.py:2279
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Wav-sonoj"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Elektu bildon"
 
-#: ../src/dialogs.py:2324
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Bildoj"
 
-#: ../src/dialogs.py:2381
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kiam %s venas:"
 
-#: ../src/dialogs.py:2383
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
 #. # means number
-#: ../src/dialogs.py:2454
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr "n°"
 
-#: ../src/dialogs.py:2460
+#: ../src/dialogs.py:2484
 msgid "Condition"
 msgstr "Kondiĉo"
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr "dum mi estas "
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Aliaj"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Babilejoj"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Senkonekta vi ne povas rigardi disponeblajn servojn"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Serĉado de servoj per konto %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Serĉado de servoj"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Neniu servo estas trovita"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3403,51 +3474,70 @@ msgstr ""
 "Servo mankas ĉe la adreso, kiun vi enigis, aŭ ĝi ne respondas. Kontrolu la "
 "adreson kaj provu denove."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Tiu ĉi servo ne rigardeblas"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 msgid "This type of service does not contain any items to browse."
 msgstr "Tiu tipo de servo ne enhavas erojn por rigardi."
 
-#: ../src/disco.py:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Rigardado %s per konto %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Rigardi"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Tiu ĉi servo ne havas erojn por rigardi."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistri"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanas %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Uzuloj"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Priskribo"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr "Id"
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Aboni"
+
+#: ../src/disco.py:1738
+#, fuzzy
+msgid "New post"
+msgstr "Nova babilejo"
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Aboni"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Aboni"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Dosiero"
@@ -3483,7 +3573,7 @@ msgid "Sender: %s"
 msgstr "Sendanto: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:574
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Ricevanto: "
 
@@ -3550,32 +3640,32 @@ msgstr "Priskribo: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s volas sendi al vi dosieron:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ne povas reskribi ekzistan dosieron \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Dosiero kun tiu nomo jam ekzistas kaj vi ne havas permeson reskribi ĝin."
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Dosierujo \"%s\" ne skribeblas"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr "Vi ne havas permeson krei dosierojn en ĉi tiu dosierujo."
 
@@ -3611,11 +3701,11 @@ msgstr "Dosiero: "
 msgid "It is not possible to send empty files"
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:564
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Nomo: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:568
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Sendanto: "
 
@@ -3623,6 +3713,212 @@ msgstr "Sendanto: "
 msgid "Pause"
 msgstr "Paŭzo"
 
+#: ../src/gajim.py:47
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim bezonas X-servilon. Eliras..."
+
+#: ../src/gajim.py:51
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim bezonas PyGTK 2.6 aŭ pli novan"
+
+#: ../src/gajim.py:52
+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
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim bezonas GTK 2.6 aŭ pli novan"
+
+#: ../src/gajim.py:55
+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
+msgid "GTK+ runtime is missing libglade support"
+msgstr "Mankas subteno de libglade en GTK+"
+
+#: ../src/gajim.py:62
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Bonvolu forigi vian nuntempan GTK+ bibliotekon kaj instali la plej lastan "
+"stabilan version de %s"
+
+#: ../src/gajim.py:64
+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
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim bezonas PySqlITE2 por funkcii"
+
+#: ../src/gajim.py:76
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim bezonas pywin32 por funkcii"
+
+#: ../src/gajim.py:77
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Bonvolu certiĝi ke Pywin32 estas instalita en via operaciuma sistemo. Vi "
+"povas preni ĝin ĉe %s"
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:189
+msgid "Gajim is already running"
+msgstr "Gajim jam estas lanĉita"
+
+#: ../src/gajim.py:190
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"Alia ekzemplero de Gajim ŝajne estas lanĉita\n"
+"Ĉu lanĉu malgraŭ tio?"
+
+#: ../src/gajim.py:297
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
+
+#: ../src/gajim.py:298
+msgid "Do you accept this request?"
+msgstr "Ĉu vi akceptas tiun peton?"
+
+#: ../src/gajim.py:344 ../src/notify.py:430
+msgid "Connection Failed"
+msgstr "Konektado malsukcesis"
+
+#: ../src/gajim.py:656
+#, python-format
+msgid "Subject: %s"
+msgstr "Temo: %s"
+
+#: ../src/gajim.py:701
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "eraro dum sendado %s ( %s )"
+
+#: ../src/gajim.py:741
+msgid "Authorization accepted"
+msgstr "Permespeto akceptitas"
+
+#: ../src/gajim.py:742
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "La kontakto \"%s\" permesas al vi vidi lian aŭ ŝian staton."
+
+#: ../src/gajim.py:750
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakto \"%s\" nuligis abonon de vi"
+
+#: ../src/gajim.py:751
+msgid "You will always see him or her as offline."
+msgstr "Vi ĉiam vidos ŝin aŭ lin senkonekta."
+
+#: ../src/gajim.py:794
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakto kun \"%s\" neestableblas"
+
+#: ../src/gajim.py:795 ../src/common/connection.py:395
+msgid "Check your connection or try again later."
+msgstr "Kontrolu vian konekton aŭ provu denove poste."
+
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s nun estas %s (%s)"
+
+#: ../src/gajim.py:1040
+msgid "Your passphrase is incorrect"
+msgstr "Via pasfrazo estas malvalida"
+
+#: ../src/gajim.py:1041
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
+
+#: ../src/gajim.py:1143
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nova retletero ĉe %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1145
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Vi havas %d novan retleteron"
+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:1154
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"De: %(from_adress)s"
+
+#: ../src/gajim.py:1297
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s volas sendi dosieron al vi."
+
+#: ../src/gajim.py:1362
+#, 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:1366
+#, 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:1379
+#, 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:1383
+#, 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:1489
+msgid "Username Conflict"
+msgstr "Konflikto de salutnomoj"
+
+#: ../src/gajim.py:1490
+msgid "Please type a new username for your local account"
+msgstr "Bonvolu enigi novan salutnomon por via loka konto"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1828
+msgid "Could not save your settings and preferences"
+msgstr "Ne povis konservi vian agordon"
+
+#: ../src/gajim.py:2020
+msgid "Network Manager support not available"
+msgstr "Subteno de retadministrilo mankas"
+
+#: ../src/gajim.py:2095
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "Subteno de seancagordo nedisponeblas (mankas modulo gnome.ui)"
+
 #: ../src/gajim-remote.py:66
 msgid "Shows a help on specific command"
 msgstr "Montri helpon pri specifita komando"
@@ -3932,212 +4228,6 @@ msgstr ""
 "Argumento \"%s\" ne estas specifita. \n"
 "Enigi \"%s help %s\" por plia informo"
 
-#: ../src/gajim.py:46
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim bezonas X-servilon. Eliras..."
-
-#: ../src/gajim.py:50
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim bezonas PyGTK 2.6 aŭ pli novan"
-
-#: ../src/gajim.py:51
-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:53
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim bezonas GTK 2.6 aŭ pli novan"
-
-#: ../src/gajim.py:54
-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:59
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Mankas subteno de libglade en GTK+"
-
-#: ../src/gajim.py:61
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Bonvolu forigi vian nuntempan GTK+ bibliotekon kaj instali la plej lastan "
-"stabilan version de %s"
-
-#: ../src/gajim.py:63
-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:68
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim bezonas PySqlITE2 por funkcii"
-
-#: ../src/gajim.py:75
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim bezonas pywin32 por funkcii"
-
-#: ../src/gajim.py:76
-#, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr ""
-"Bonvolu certiĝi ke Pywin32 estas instalita en via operaciuma sistemo. Vi "
-"povas preni ĝin ĉe %s"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:156
-msgid "Gajim is already running"
-msgstr "Gajim jam estas lanĉita"
-
-#: ../src/gajim.py:157
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Alia ekzemplero de Gajim ŝajne estas lanĉita\n"
-"Ĉu lanĉu malgraŭ tio?"
-
-#: ../src/gajim.py:257
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
-
-#: ../src/gajim.py:258
-msgid "Do you accept this request?"
-msgstr "Ĉu vi akceptas tiun peton?"
-
-#: ../src/gajim.py:304 ../src/notify.py:432
-msgid "Connection Failed"
-msgstr "Konektado malsukcesis"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "Subject: %s"
-msgstr "Temo: %s"
-
-#: ../src/gajim.py:656
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "eraro dum sendado %s ( %s )"
-
-#: ../src/gajim.py:696
-msgid "Authorization accepted"
-msgstr "Permespeto akceptitas"
-
-#: ../src/gajim.py:697
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "La kontakto \"%s\" permesas al vi vidi lian aŭ ŝian staton."
-
-#: ../src/gajim.py:705
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakto \"%s\" nuligis abonon de vi"
-
-#: ../src/gajim.py:706
-msgid "You will always see him or her as offline."
-msgstr "Vi ĉiam vidos ŝin aŭ lin senkonekta."
-
-#: ../src/gajim.py:749
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakto kun \"%s\" neestableblas"
-
-#: ../src/gajim.py:750 ../src/common/connection.py:389
-msgid "Check your connection or try again later."
-msgstr "Kontrolu vian konekton aŭ provu denove poste."
-
-#: ../src/gajim.py:895 ../src/roster_window.py:1119
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s nun estas %s (%s)"
-
-#: ../src/gajim.py:986
-msgid "Your passphrase is incorrect"
-msgstr "Via pasfrazo estas malvalida"
-
-#: ../src/gajim.py:987
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
-
-#: ../src/gajim.py:1089
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Nova retletero ĉe %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1091
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Vi havas %d novan retleteron"
-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:1100
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-"\n"
-"De: %(from_adress)s"
-
-#: ../src/gajim.py:1235
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s volas sendi dosieron al vi."
-
-#: ../src/gajim.py:1297
-#, 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:1301
-#, 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:1314
-#, 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:1318
-#, 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:1420
-msgid "Username Conflict"
-msgstr "Konflikto de salutnomoj"
-
-#: ../src/gajim.py:1421
-msgid "Please type a new username for your local account"
-msgstr "Bonvolu enigi novan salutnomon por via loka konto"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1753
-msgid "Could not save your settings and preferences"
-msgstr "Ne povis konservi vian agordon"
-
-#: ../src/gajim.py:1943
-msgid "Network Manager support not available"
-msgstr "Subteno de retadministrilo mankas"
-
-#: ../src/gajim.py:2014
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Subteno de seancagordo nedisponeblas (mankas modulo gnome.ui)"
-
 #: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Etoso"
@@ -4186,85 +4276,85 @@ msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Aliĝo de %(nick)s nun estas malpermesa: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Aliĝo de %(nick)s estas malpermesita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s nomiĝas %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
 
-#: ../src/groupchat_control.py:895
+#: ../src/groupchat_control.py:899
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1122
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s nun estas %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: ../src/groupchat_control.py:1050
+#: ../src/groupchat_control.py:1054
 msgid "This group chat has no subject"
 msgstr "Tiu ĉi babilejo ne havas temon"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s invititas al %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "Tio ne estas valida JID: %s"
 
-#: ../src/groupchat_control.py:1181
+#: ../src/groupchat_control.py:1185
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Ne estas tiu komando: /%s (se vi volas sendi tion, metu /say antaŭen)"
 
-#: ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Komandoj: %s"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4276,7 +4366,7 @@ msgstr ""
 "babilejo. Eblas uzi la kaŝnomon de uzulo, sed ne se ĝi entenas \"@\" aŭ "
 "spaceton. Se la JID ĉeestas en la babilejo, tiu estos ankaŭ elpelita."
 
-#: ../src/groupchat_control.py:1213
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4284,12 +4374,12 @@ msgstr ""
 "Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
 "specifita persono."
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4298,12 +4388,12 @@ msgstr ""
 "Uzado: /%s [kialo], - fermas la nuntempan fenestron aŭ slipon, informe pri "
 "kialo se specifita."
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
 
-#: ../src/groupchat_control.py:1225
+#: ../src/groupchat_control.py:1229
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4312,7 +4402,7 @@ msgstr ""
 "Uzado: /%s <JID> [kialo], - invitas JID al la nuntempa babilejo, fakultative "
 "informante pri kialo."
 
-#: ../src/groupchat_control.py:1229
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4321,7 +4411,7 @@ msgstr ""
 "Uzado: /%s <babilejo>@<servilo>[/kaŝnomo], - aliĝas al room@server "
 "fakultative uze specifitan kaŝnomon."
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4331,7 +4421,7 @@ msgstr ""
 "Uzado: /%s <kaŝnomo> [kialo], - forigas la uzulon specifitan per kaŝnomo el "
 "la babilejo kaj fakultative montras kialon. NE SUBTENAS spacetojn en kaŝnomo."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4339,7 +4429,7 @@ msgid ""
 msgstr ""
 "Uzado: /%s <ago>, sendas agon en aktualan babilejon (ekzemple /%s eksplodas)."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4348,93 +4438,93 @@ msgstr ""
 "Uzado: /%s <kaŝnomo> [mesaĝo], malfermas privatan mesaĝan fenestron kaj "
 "sendas mesaĝon al la uzulo specifita per kaŝnomo."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1251
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uzado: /%s <kaŝnomo>, ŝanĝas vian kaŝnomon en nuntempa babilejo."
 
-#: ../src/groupchat_control.py:1251
+#: ../src/groupchat_control.py:1255
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uzado: /%s , - eligas la nomoj de babilejaj ĉeestantoj."
 
-#: ../src/groupchat_control.py:1255
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uzado: /%s [temo], - eligas aŭ novigas la nuntempan babilejan temon."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1262
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uzado: /%s <mesaĝo>, - sendas mesaĝon preter rekonado de aliaj komandoj."
 
-#: ../src/groupchat_control.py:1261
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "helpinformo mankas por /%s"
 
-#: ../src/groupchat_control.py:1310
+#: ../src/groupchat_control.py:1314
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1316
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se vi fermos tiun fenestron, vi senkonektiĝos de tiu ĉi babilejo."
 
-#: ../src/groupchat_control.py:1316
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Ne plu demandi"
 
-#: ../src/groupchat_control.py:1350
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: ../src/groupchat_control.py:1360
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/groupchat_control.py:1361
+#: ../src/groupchat_control.py:1365
 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:1387
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Legosigno jam estas metita"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1391
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Legosigno sukcese aldonitas"
 
-#: ../src/groupchat_control.py:1398
+#: ../src/groupchat_control.py:1401
 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:1515
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: ../src/groupchat_control.py:1516 ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1798
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
@@ -4463,32 +4553,32 @@ msgstr "Detalaĵoj"
 msgid "Error: cannot open %s for reading"
 msgstr "Eraro: ne povas malfermi %s por legi"
 
-#: ../src/gtkgui_helpers.py:292
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Eraro dum legado de dosiero:"
 
-#: ../src/gtkgui_helpers.py:295
+#: ../src/gtkgui_helpers.py:296
 msgid "Error parsing file:"
 msgstr "Eraro dum dosieranalizo:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:333
+#: ../src/gtkgui_helpers.py:334
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Ne povas skribi en %s. Subteno de seancagordo ne funkcios"
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Bildo nekonserveblas en %(type)s formato. Ĉu konservu kiel %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:738
+#: ../src/gtkgui_helpers.py:737
 msgid "Save Image as..."
 msgstr "Konservi bildon kiel..."
 
@@ -4594,11 +4684,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:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Mesaĝoj"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4638,127 +4728,127 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nova mesaĝo de %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr "Obtenas vizitkarton..."
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr "Klaku por starigi vian kaŝbildon"
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 msgid "Information received"
 msgstr "Informo estas ricevita"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senkonekte vi ne povas publikigi vian kontaktan informon."
 
-#: ../src/profile_window.py:327
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr "Publicas vizitkarton..."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr "Informo publicitas"
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr "Informo NE publicitis"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "Publicado de vizitkarto malsukcesis"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "Estis eraro dum publicado de persona informo, provu denove pli poste."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 msgid "Without a connection, you can not get your contact information."
 msgstr "Senkonekte vi ne povas ricevi vian kontaktan informon."
 
-#: ../src/roster_window.py:145 ../src/roster_window.py:197
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: ../src/roster_window.py:302 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Rigardiloj"
 
-#: ../src/roster_window.py:606 ../src/roster_window.py:2867
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "per konto %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:817
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "al konto %s"
 
 #. disco
-#: ../src/roster_window.py:822
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "per konto %s"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:828 ../src/systray.py:184 ../src/systray.py:189
-#, python-format
-msgid "using account %s"
-msgstr "per konto %s"
-
 #. profile, avatar
-#: ../src/roster_window.py:895
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "de konto %s"
 
-#: ../src/roster_window.py:915
+#: ../src/roster_window.py:1003
 msgid "_Manage Bookmarks..."
 msgstr "Aranĝi _legosignojn..."
 
-#: ../src/roster_window.py:944
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "por konto %s"
 
 #. History manager
-#: ../src/roster_window.py:965
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: ../src/roster_window.py:974
+#: ../src/roster_window.py:1062
 msgid "_Join New Group Chat"
 msgstr "_Eniri babilejen"
 
-#: ../src/roster_window.py:1284 ../src/roster_window.py:3051
-#: ../src/roster_window.py:3057
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: ../src/roster_window.py:1285
+#: ../src/roster_window.py:1385
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaŭ forigi tiun transportilon."
 
-#: ../src/roster_window.py:1288
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: ../src/roster_window.py:1289
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4766,11 +4856,11 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: ../src/roster_window.py:1291
+#: ../src/roster_window.py:1392
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: ../src/roster_window.py:1296
+#: ../src/roster_window.py:1397
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4779,71 +4869,120 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiuj ĉi "
 "transportiloj:%s"
 
-#: ../src/roster_window.py:1340
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Konflikto de salutnomoj"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Renomigi"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Forigi"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Forigas kontakton el kontaktlisto"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Atribui OpenPGP-ŝlosilon"
 
-#: ../src/roster_window.py:1341
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Elektu ŝlosilon por atribui al la kontakto"
 
-#: ../src/roster_window.py:1596 ../src/roster_window.py:1771
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 msgid "_New group chat"
 msgstr "_Nova babilejo"
 
-#: ../src/roster_window.py:1654
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Mi volus aldoni vin en mian kontaktliston"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "_Sendi servilon mesaĝon"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Re_nomigi"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+msgid "To all online users"
+msgstr ""
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "E_nsaluti"
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "E_lsaluti"
 
-#: ../src/roster_window.py:1978 ../src/roster_window.py:2040
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "Ŝanĝi _statmesaĝon"
 
-#: ../src/roster_window.py:2110
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Permeso estas sendita"
 
-#: ../src/roster_window.py:2111
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: ../src/roster_window.py:2135
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: ../src/roster_window.py:2136
+#: ../src/roster_window.py:2401
 #, 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:2147
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Permeso estas forigita"
 
-#: ../src/roster_window.py:2148
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:2355
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakto \"%s\" estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:2359
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4851,7 +4990,7 @@ msgstr ""
 "Forigante tiun kontakton vi forigas ankaŭ permeson, rezulte ŝi aŭ li ĉiam "
 "vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:2363
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4859,16 +4998,16 @@ msgstr ""
 "Forigante tiu ĉi konton vi defaŭlte ankaŭ forigas permeson pro kio li aŭ ŝi "
 "ĉiam vidos vin senkonekta."
 
-#: ../src/roster_window.py:2364
+#: ../src/roster_window.py:2629
 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:2368
+#: ../src/roster_window.py:2633
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktoj estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:2372
+#: ../src/roster_window.py:2637
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4877,32 +5016,32 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:2441
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: ../src/roster_window.py:2442
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: ../src/roster_window.py:2447
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Konservi pasfrazon"
 
-#: ../src/roster_window.py:2455
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Malprava pasfrazo"
 
-#: ../src/roster_window.py:2456
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
 
-#: ../src/roster_window.py:2508 ../src/roster_window.py:2567
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
 
-#: ../src/roster_window.py:2509 ../src/roster_window.py:2568
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4910,125 +5049,152 @@ 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:2525
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2800
 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:2621
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr "♪ \"%(title)s\" de %(artist)s ♪"
 
-#: ../src/roster_window.py:3052 ../src/roster_window.py:3058
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 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:3882
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr "Vi devas krei konton antaŭ vi povos paroli kun aliaj kontaktoj."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Movi %s en la grupon %s"
 
-#: ../src/roster_window.py:3889
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Igi %s kaj %s metakontaktoj"
 
-#: ../src/roster_window.py:4075
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Ŝanĝi statmesaĝon..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "Ŝanĝi _statmesaĝon..."
 
-#: ../src/tooltips.py:310
-msgid "JID: "
-msgstr "JID: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Kaŝi tiun ĉi menuon"
+
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+msgid "Jabber ID: "
+msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:313 ../src/tooltips.py:497
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Risurco: "
 
-#: ../src/tooltips.py:318
+#: ../src/tooltips.py:317
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de tiu ĉi babilejo"
 
-#: ../src/tooltips.py:431 ../src/tooltips.py:611
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:462
+#: ../src/tooltips.py:461
 #, python-format
 msgid "Last status: %s"
 msgstr "Lasta stato: %s"
 
-#: ../src/tooltips.py:464
+#: ../src/tooltips.py:463
 #, python-format
 msgid " since %s"
 msgstr " ekde %s"
 
-#: ../src/tooltips.py:493
-msgid "Jabber ID: "
-msgstr "Jabber-ID: "
-
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Subscription: "
 msgstr "Abono: "
 
-#: ../src/tooltips.py:513
+#: ../src/tooltips.py:512
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Elŝuti"
 
-#: ../src/tooltips.py:573
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Alŝuti"
 
-#: ../src/tooltips.py:580
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:586
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Transmetitas: "
 
-#: ../src/tooltips.py:589 ../src/tooltips.py:610
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Ne lanĉitas"
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Haltis"
 
-#: ../src/tooltips.py:595 ../src/tooltips.py:598
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Plenumita"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Malrapidas"
 
-#: ../src/tooltips.py:608
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Transdonas"
 
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Tiu ĉi servo ankoraŭ ne respondis kun detala informo"
 
-#: ../src/tooltips.py:643
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5036,24 +5202,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:217
 msgid "?Client:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:205
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:233 ../src/vcard.py:434
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "ekde %s"
 
-#: ../src/vcard.py:263
+#: ../src/vcard.py:277
 msgid "Affiliation:"
 msgstr "Aparteneco:"
 
-#: ../src/vcard.py:271
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5061,29 +5227,29 @@ msgstr ""
 "Tiu ĉi kontakto interesiĝas pri via ĉeesta informo, sed vi ne interesiĝas "
 "pri ŝia/lia ĉeesto"
 
-#: ../src/vcard.py:273
+#: ../src/vcard.py:287
 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:275
+#: ../src/vcard.py:289
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vi kaj la kontakto interesiĝas unu pri alia ĉeesta informo"
 
 #. None
-#: ../src/vcard.py:277
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Nek vi nek kontakto ne interesiĝas unu pri ĉeesto de alia"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:299
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Vi atendas respondon de kontakto pri via abona mendo"
 
-#: ../src/vcard.py:297 ../src/vcard.py:324 ../src/vcard.py:467
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
@@ -5253,7 +5419,18 @@ msgstr ""
 "listen_to_network_manager=False kaj sync_with_global_status=True) surbaze de "
 "la stato de la retkonekto."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -5261,11 +5438,11 @@ msgstr ""
 "Kiam ne eligas tempon por ĉiu mesaĝo (print_time==sometimes), eligi ĝin "
 "ĉiujn x minutojn."
 
-#: ../src/common/config.py:158
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5273,7 +5450,7 @@ msgstr ""
 "Ĉiam demandi antaŭ fermi slipon/fenestron de babilejo el tiu cpacetdisigita "
 "listo de babilejaj JID."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:161
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5281,7 +5458,7 @@ msgstr ""
 "Neniam demandi antaŭ fermi babilejan slipon/fenestron el tiu ĉi listo de "
 "babilejaj JID separataj per spacetoj."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5289,29 +5466,34 @@ msgstr ""
 "Redifinas la retadreson, kiun ni sendas por dosiertransmeto okaze de "
 "adrestradukado."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC normo diras: KiB = 1024 bajtoj, KB = 1000 bajtoj."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:168
+#, fuzzy
+msgid "Notify of events in the system trayicon."
+msgstr "Ne montri kontaktliston en la sistema taskostrio."
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Ĉu montri langeton kiam estas nur unu konversacio?"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Ĉu montri langetan framon en interparolajn fenestrojn?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Ĉu montri fermontan butonon en sliplangeto?"
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:189
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Listo de punktokome separataj vortoj, kiuj estos emfazataj en babilejo."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5319,11 +5501,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:190
+#: ../src/common/config.py:191
 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:191
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5331,7 +5513,7 @@ msgstr ""
 "Se \"True\", Gajim montros piktogramon sur ĉiuj langeton, kies slipo enhavas "
 "nelegitajn mesaĝojn. Depende de etoso tiu piktogramo povas esti animaciata."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:193
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -5339,7 +5521,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:194
+#: ../src/common/config.py:195
 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."
@@ -5347,7 +5529,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:195
+#: ../src/common/config.py:196
 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."
@@ -5355,7 +5537,7 @@ msgstr ""
 "Se \"False\", Gajim ne plu eligos statlineon en interparolaj fenestroj kiam "
 "kontakto ŝanĝas lian aŭ ŝian staton kaj/aŭ statmesaĝon."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:197
 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 "
@@ -5369,20 +5551,28 @@ msgstr ""
 "Gajim eligos nur pri eniroj/eliroj."
 
 #: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 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:200
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne montri kaŝbildeton por transportilo mem."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne montri kontaktliston en la sistema taskostrio."
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:205
 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 "
@@ -5392,7 +5582,7 @@ msgstr ""
 "fenestran briladon (la defaŭlta konduto de plimulto da fenestragordiloj) "
 "kiam estas atendantaj eventoj."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:207
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -5403,7 +5593,7 @@ msgstr ""
 "informon en babilejo."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:207
+#: ../src/common/config.py:210
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5421,35 +5611,35 @@ msgstr ""
 "apartan fenestron. Rimarku, ŝanĝo de tiu opcio bezonas relanĉon de Gajim "
 "antaŭ la ŝanĝo efikos."
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:211
 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:209
+#: ../src/common/config.py:212
 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:210
+#: ../src/common/config.py:213
 msgid "Hides the buttons in group chat window."
 msgstr "Kaŝas la butonojn en babileja fenestro."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:214
 msgid "Hides the buttons in two persons chat window."
 msgstr "Kaŝas la butonojn en dupersona interparola fenestro."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Kaŝas rubandon en babileja fenestro"
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Kaŝas rubandon en dupersona interparola fenestro"
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:217
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Kaŝas la liston de partoprenantoj en la babileja fenestro."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:218
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -5457,19 +5647,32 @@ msgstr ""
 "En konversacio, montri la kaŝnomon komence de linio nur kiam tiu ne estas la "
 "sama persono dirinta ĉi-antaŭan mesaĝon."
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr "Alineo kiam uzatas unuigo de ripetaj kaŝnomoj."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:220
 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:218
+#: ../src/common/config.py:221
 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:229
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -5478,11 +5681,11 @@ msgstr ""
 "agorderoj \"autopriority_*\"."
 
 #. yes, no, ask
-#: ../src/common/config.py:258
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 ĉirkaŭiro"
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5490,101 +5693,101 @@ msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:326
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
-#: ../src/common/config.py:322 ../src/common/config.py:325
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr "'all' aŭ spacetseparitaj statoj"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:337
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', aŭ 'both'"
 
-#: ../src/common/config.py:333 ../src/common/config.py:335
-#: ../src/common/config.py:336 ../src/common/config.py:339
-#: ../src/common/config.py:340
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' aŭ ''"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Revenos baldaŭ"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Manĝas"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Mi manĝas, do restigu mesaĝon por mi."
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Kino"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Laboras"
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: ../src/common/config.py:351
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefonado"
 
-#: ../src/common/config.py:351
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Eliris"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:357
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:361
 msgid "I'm available."
 msgstr "Mi disponeblas."
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:362
 msgid "I'm free for chat."
 msgstr "Mi babilemas."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:364
 msgid "I'm not available."
 msgstr "Mi ne disponeblas."
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: ../src/common/config.py:361 ../src/common/config.py:362
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr "Ĝis!"
 
-#: ../src/common/config.py:371
+#: ../src/common/config.py:376
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -5592,131 +5795,38 @@ msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: ../src/common/config.py:372
+#: ../src/common/config.py:377
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:193
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "verda"
 
-#: ../src/common/config.py:384 ../src/common/optparser.py:179
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "manĝbutiko"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "homa"
 
-#: ../src/common/config.py:392
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "mara"
 
-#: ../src/common/connection.py:162
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Konekto kun konto \"%s\" rompiĝis"
-
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:200
-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: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:200
-msgid "Invalid answer"
-msgstr "Nekorekta respondo"
-
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
-#: ../src/common/zeroconf/connection_zeroconf.py:220
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Ne povas konekti al \"%s\""
-
-#: ../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:424
-msgid "Check your connection or try again later"
-msgstr "Kontrolu vian konekton aŭ provu denove poste"
-
-#: ../src/common/connection.py:449
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Aŭtentokontrolo malsukcesis kun \"%s\""
-
-#: ../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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:159
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP-pasfrazo ne estis donita"
-
-#. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:161
-#, 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:606
-msgid "invisible"
-msgstr "nevidebla"
-
-#: ../src/common/connection.py:607
-msgid "offline"
-msgstr "senkonekta"
-
-#: ../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:699
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
-
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:393
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Temo: %s\n"
-"%s"
-
-#: ../src/common/connection.py:885
-msgid "Not fetched because of invisible status"
-msgstr "Ne obtenita pro nevidebla stato"
-
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid "Wrong host"
 msgstr "Malprava servilnomo"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5729,7 +5839,7 @@ msgstr ""
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrada informo por transportilo %s ne venis ĝustatempe"
 
-#: ../src/common/connection_handlers.py:1459
+#: ../src/common/connection_handlers.py:1519
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kaŝnomo malpermesita: %s"
@@ -5737,41 +5847,41 @@ msgstr "Kaŝnomo malpermesita: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1521
-#: ../src/common/connection_handlers.py:1524
-#: ../src/common/connection_handlers.py:1527
-#: ../src/common/connection_handlers.py:1530
-#: ../src/common/connection_handlers.py:1533
-#: ../src/common/connection_handlers.py:1536
-#: ../src/common/connection_handlers.py:1544
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
 msgid "Unable to join group chat"
 msgstr "Neeblas aliĝi al babilejo"
 
-#: ../src/common/connection_handlers.py:1522
+#: ../src/common/connection_handlers.py:1582
 msgid "A password is required to join this group chat."
 msgstr "Necesas pasvorto por aliĝi al la babilejo."
 
-#: ../src/common/connection_handlers.py:1525
+#: ../src/common/connection_handlers.py:1585
 msgid "You are banned from this group chat."
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/common/connection_handlers.py:1528
+#: ../src/common/connection_handlers.py:1588
 msgid "Such group chat does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: ../src/common/connection_handlers.py:1531
+#: ../src/common/connection_handlers.py:1591
 msgid "Group chat creation is restricted."
 msgstr "Babileja kreado limigitas."
 
-#: ../src/common/connection_handlers.py:1534
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Vi devas uzi vian registritan kaŝnomon."
 
-#: ../src/common/connection_handlers.py:1537
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Vi ne ĉeestas en membrolisto."
 
-#: ../src/common/connection_handlers.py:1545
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5779,27 +5889,27 @@ msgstr ""
 "Via dezirata kaŝnomo estas uzata aŭ registrita per alia uzulo.\n"
 "Bonvolu specifi alian kaŝnomon jene:"
 
-#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1651
 msgid "I would like to add you to my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1612
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nun ni abonas %s"
 
-#: ../src/common/connection_handlers.py:1614
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "ordono pri abona fino de %s"
 
-#: ../src/common/connection_handlers.py:1616
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ni nun ne abonas pri %s"
 
-#: ../src/common/connection_handlers.py:1786
+#: ../src/common/connection_handlers.py:1846
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5808,12 +5918,104 @@ msgstr ""
 "JID %s ne estas norma laŭ la RFC. Ĝi ne aldonitos al via kontaktlisto. Uzu "
 "kontaktlistan agordan ilon kiel http://jru.jabberstudio.org/ por forigi ĝin"
 
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Konekto kun konto \"%s\" rompiĝis"
+
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
+msgstr ""
+
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr "Transportilo %s respondis malprave al registra peto."
+
+#. wrong answer
+#: ../src/common/connection.py:202
+msgid "Invalid answer"
+msgstr "Nekorekta respondo"
+
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
+#: ../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:408
+#, python-format
+msgid "Connected to server %s:%s with %s"
+msgstr "Konektis al servilo %s:%s per %s"
+
+#: ../src/common/connection.py:430
+msgid "Check your connection or try again later"
+msgstr "Kontrolu vian konekton aŭ provu denove poste"
+
+#: ../src/common/connection.py:455
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Aŭtentokontrolo malsukcesis kun \"%s\""
+
+#: ../src/common/connection.py:456
+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:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP-pasfrazo ne estis donita"
+
+#. %s is the account name here
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
+#, 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:615
+msgid "invisible"
+msgstr "nevidebla"
+
+#: ../src/common/connection.py:616
+msgid "offline"
+msgstr "senkonekta"
+
+#: ../src/common/connection.py:617
+#, python-format
+msgid "I'm %s"
+msgstr "Mi estas %s"
+
+#. we're not english
+#. one  in locale and one en
+#: ../src/common/connection.py:708
+msgid "[This message is *encrypted* (See :JEP:`27`]"
+msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
+
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
+#, python-format
+msgid ""
+"Subject: %s\n"
+"%s"
+msgstr ""
+"Temo: %s\n"
+"%s"
+
+#: ../src/common/connection.py:897
+msgid "Not fetched because of invisible status"
+msgstr "Ne obtenita pro nevidebla stato"
+
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Pitona bindmodulo por D-BUS mankas cxe tiu cxi komputilo"
 
-#: ../src/common/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-BUS kunigeblo de Gajim ne uzeblas"
 
@@ -5989,238 +6191,238 @@ msgstr "Fino de semajno"
 msgid "Weekend!"
 msgstr "Semajnofino!"
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Malkorekta signo en salutnomo."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Necesas adreso de servilo."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Malkorekta signo en servilnomo."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Malkorekta signo en risurcnomo."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Okupata"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Okupata"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Nedisponebla"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Babilema"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Babilema"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Enrete"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Enrete"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Konektas"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "_Fora"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Senkonekta"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "Ne_videbla"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "Nekonata"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "Eraroj"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Al"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "Nenion"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderigantoj"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderiganto"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Partoprenantoj"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Partoprenanto"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Vizitantoj"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Vizitanto"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 msgid "Owner"
 msgstr "Mastro"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 msgid "Administrator"
 msgstr "Administristo"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "atentas al la komunikado"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "faras ion alian"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 msgid "is composing a message..."
 msgstr "tajpas mesaĝon..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "paŭzas tajpi mesaĝon"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "fermis la interparolan fenestron aŭ slipon"
 
-#: ../src/common/helpers.py:875
+#: ../src/common/helpers.py:880
 #, python-format
 msgid " %d unread message"
 msgid_plural " %d unread messages"
 msgstr[0] " %d nelegita mesaĝo"
 msgstr[1] " %d nelegitaj mesaĝoj"
 
-#: ../src/common/helpers.py:881
+#: ../src/common/helpers.py:886
 #, python-format
 msgid " %d unread single message"
 msgid_plural " %d unread single messages"
 msgstr[0] " %d nelegita unuopa mesaĝo"
 msgstr[1] " %d nelegitaj unuopaj mesaĝoj"
 
-#: ../src/common/helpers.py:887
+#: ../src/common/helpers.py:892
 #, python-format
 msgid " %d unread group chat message"
 msgid_plural " %d unread group chat messages"
 msgstr[0] " %d nelegita babileja mesaĝo"
 msgstr[1] " %d nelegitaj babilejaj mesaĝoj"
 
-#: ../src/common/helpers.py:893
+#: ../src/common/helpers.py:898
 #, python-format
 msgid " %d unread private message"
 msgid_plural " %d unread private messages"
 msgstr[0] " %d nelegita privata mesaĝo"
 msgstr[1] "%d nelegitaj privataj mesaĝoj"
 
-#: ../src/common/helpers.py:903 ../src/common/helpers.py:905
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6231,28 +6433,51 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "eraro: %s nedisponeblas por legi"
 
-#: ../src/common/optparser.py:179
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:188 ../src/common/optparser.py:189
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "blua"
 
-#: ../src/common/optparser.py:298
+#: ../src/common/optparser.py:302
 msgid "migrating logs database to indeces"
 msgstr "indeksigas protokolan datumbazon"
 
-#: ../src/common/passwords.py:78
+#: ../src/common/passwords.py:86
 #, python-format
 msgid "Gajim account %s"
 msgstr "Gajim-konto %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:210
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Konekto kun punkto neestableblas."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+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/zeroconf/connection_zeroconf.py:207
 msgid "Avahi error"
 msgstr "Eraro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:210
+#: ../src/common/zeroconf/connection_zeroconf.py:207
 #, python-format
 msgid ""
 "%s\n"
@@ -6261,40 +6486,49 @@ msgstr ""
 "%s\n"
 "Lig-loka komunikado ne povas funkcii korekte."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:230
-#: ../src/common/zeroconf/connection_zeroconf.py:234
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 msgid "Could not start local service"
 msgstr "Ne povas lanĉi lokan servon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:231
+#: ../src/common/zeroconf/connection_zeroconf.py:228
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Neeblas aliĝi al pordo %s."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:235
-#: ../src/common/zeroconf/connection_zeroconf.py:327
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:326
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ne povas ŝanĝi staton de konto \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:351
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/common/zeroconf/zeroconf.py:184
+#: ../src/common/zeroconf/zeroconf.py:180
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "eraro dum aldonado de servo %s"
 
+#~ msgid "JID: "
+#~ msgstr "JID: "
+
 #~ msgid "Merge consecutive nickname in chat window."
 #~ msgstr "Unuigi ripetajn kaŝnomojn en konversacia fenestro."
 
@@ -6308,18 +6542,12 @@ msgstr "eraro dum aldonado de servo %s"
 #~ "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\")"
 
-#~ msgid "New Room"
-#~ msgstr "Nova babilejo"
-
 #~ msgid "Invalid room or server name"
 #~ msgstr "Malkorekta nomo de babilejo aŭ servilo"
 
 #~ msgid "_Join New Room"
 #~ msgstr "_Aliĝi al nova babilejo"
 
-#~ msgid "Hide this menu"
-#~ msgstr "Kaŝi tiun ĉi menuon"
-
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d nelegita mesaĝo"
@@ -6328,9 +6556,6 @@ msgstr "eraro dum aldonado de servo %s"
 #~ msgid "_Account:"
 #~ msgstr "_Konto:"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Aboni"
-
 #~ msgid "Add"
 #~ msgstr "Aldoni"
 
diff --git a/po/es.po b/po/es.po
index 80072d2ec..f145d7d43 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -44,22 +44,26 @@ msgid "_Discover Services..."
 msgstr "_Descubrir servicios..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Grupos de charla"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modificar cuenta..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir el compositor de correo"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Estado"
@@ -245,16 +249,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "General"
 
@@ -314,17 +320,17 @@ msgid "Manage..."
 msgstr "Gestionar..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ninguno"
 
@@ -612,11 +618,11 @@ msgstr "Editor avanzado de configurción"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Estado: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Ausente"
 
@@ -634,7 +640,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -644,21 +650,25 @@ msgid "Launch a command"
 msgstr "comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "No disponible"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Libre para hablar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "Reproducir _sonidos"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -671,16 +681,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr "Cuando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -740,7 +747,7 @@ msgid "for "
 msgstr "Puerto: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -777,7 +784,7 @@ msgstr "Entrar a un grupo de charla"
 #: ../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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Añadir a la lista de contactos"
 
@@ -800,7 +807,7 @@ msgstr "_Abrir enlace en navegador"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "Iniciar conversación"
 
@@ -809,7 +816,7 @@ msgid "Click to see past conversations with this contact"
 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/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Enviar archivo"
@@ -826,12 +833,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Histórico"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "En el grupo"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Configuración del salón"
 
@@ -920,11 +932,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr ""
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Cuenta\n"
 "Grupo\n"
@@ -974,7 +987,7 @@ msgid ""
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Pausado"
 
@@ -1109,14 +1122,14 @@ msgstr "Denegar"
 msgid "Invitation Received"
 msgstr "Invitación recibida"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Alias:"
 
@@ -1134,8 +1147,8 @@ msgstr "Recientemente:"
 msgid "Room:"
 msgstr "Salón:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1186,7 +1199,7 @@ msgstr "Gestionar perfiles del Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -1203,14 +1216,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Acciones"
 
@@ -1312,10 +1325,12 @@ msgid "Auto _not available after:"
 msgstr "Poner _no disponible después de:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Autodetectar en cada inicio de Gajim\n"
@@ -1323,19 +1338,15 @@ msgstr ""
 "Siempre usar las apliacciones por defecto de KDE\n"
 "Personalizado"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 #, fuzzy
 msgid "B_efore nickname:"
 msgstr "Antes del nombre:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Charla"
 
-#: ../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:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1347,44 +1358,63 @@ msgstr ""
 "contacto que no esté en tu lista de contactos."
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Mensaje de estado"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 #, fuzzy
 msgid "Default status _iconset:"
 msgstr "_Iconos de estado por defecto:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 #, 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:36
+#: ../data/glade/preferences_window.glade.h:37
 #, 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:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Noti_ficaciones del estado del chat"
+
+#: ../data/glade/preferences_window.glade.h:39
 #, fuzzy
 msgid "E_very 5 minutes"
 msgstr "Cada 5 _minutos"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Gestionar emoticonos"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Eventos"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+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:43
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1394,7 +1424,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:41
+#: ../data/glade/preferences_window.glade.h:44
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -1402,7 +1432,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:42
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -1411,7 +1441,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:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1419,7 +1449,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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1427,19 +1457,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:45
+#: ../data/glade/preferences_window.glade.h:48
 #, 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -1447,7 +1477,7 @@ msgid ""
 msgstr ""
 "Si está marcado, Gajim mostrará los avatares de los usuarios en el roster"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1456,7 +1486,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:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1464,7 +1494,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1474,7 +1504,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:52
+#: ../data/glade/preferences_window.glade.h:55
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -1483,12 +1513,16 @@ msgstr ""
 "Si está marcado, Gajim reemplazará emoticonos de texto como ':)' por su "
 "equivalente en iconos"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Gestionar..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1496,88 +1530,99 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Notificar cuand un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "En cada _mensaje"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 #, fuzzy
 msgid "One message _window:"
 msgstr "Enviar mensaje y cerrar ventana"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Noti_ficaciones del estado del chat"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Reproducir _sonidos"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Insertar la hora:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Sólo mostrar en la _lista de contactos"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "El mensaje de estado de auto-ausencia"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "El mensaje de estado de no auto-no disponible"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "_Usar los iconos del transporte"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 #, fuzzy
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Icono en el área de notificación"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -1590,106 +1635,112 @@ 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:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Cuando se reciba un nuevo evento"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Editor avanzado de configurción"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 #, fuzzy
 msgid "_After time:"
 msgstr "Después de la hora:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "_Before time:"
 msgstr "Antes de la hora:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "_File manager:"
 msgstr "Administrador de archivos:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "_Font:"
 msgstr "Fuente:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortográficos"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Mensaje entrante:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Registrar cambios de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Notificarme"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Mensaje saliente:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Reproductor:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Emerger"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Restablecer colores por defecto"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Status message:"
 msgstr "Mensaje de estado:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minutos"
 
@@ -1720,7 +1771,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "C_onectar al inicio de Gajim"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1738,7 +1789,7 @@ msgstr "ID de Jabber:"
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr ""
 
@@ -1806,116 +1857,116 @@ msgid "City:"
 msgstr "Ciudad:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Compañía:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "País:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Departamento:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Segunda dirección:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Nombre de pila:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Página web:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Medio:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Más"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Información personal"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Teléfono:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Posición:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 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
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Prefijo"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Puesto:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Estado:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Calle:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Sufijo:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Trabajo"
 
@@ -1957,47 +2008,54 @@ msgstr "Asignar clave OpenPGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1774
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Editar grupos"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Enviar mensaje"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Iniciar conversación"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Permitirle ver mi estado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, fuzzy
 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:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Eliminar del Roster"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "Renombrar"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Subscripción"
 
@@ -2043,8 +2101,8 @@ msgstr "_Contenidos"
 msgid "_Discover Services"
 msgstr "_Descubrir servicios"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -2134,36 +2192,42 @@ msgid "_Send & Close"
 msgstr "_Enviar y Cerrar"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Autorizar"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Petición de adición"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Autorizar"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Sonidos Wav"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos los _eventos pendientes"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Mostrar _roster"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Es_tado"
 
@@ -2176,38 +2240,43 @@ msgstr "Pregunta:"
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Comentario: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Contacto:"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "SO:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Estado:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Subscripción:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "Histórico de conversaciones"
@@ -2400,7 +2469,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2429,50 +2498,50 @@ msgstr "No hay disponible una conexión"
 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:834
+#: ../src/chat_control.py:839
 #, fuzzy
 msgid "Chats"
 msgstr "Charla"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(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:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Encriptación activada"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Encriptación desactivada"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "no está en el roster"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2480,322 +2549,327 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Cada %s _minutos"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, 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
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nuevo mensaje"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nombre de contacto"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto conectado"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensaje"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Invitación recibida"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "GPG no es usable en este ordenador"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 #, 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:1289
+#: ../src/config.py:1337
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 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:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 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:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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:1570 ../src/config.py:3326
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptación OpenPGP"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "No tienes cuentas activas"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 #, fuzzy
 msgid "Member List"
 msgstr "_Miembro"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 #, fuzzy
 msgid "Owner List"
 msgstr "_Propietario"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr ""
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 #, fuzzy
 msgid "Role"
 msgstr "Puesto:"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 #, fuzzy
 msgid "Banning..."
 msgstr "Expulsando a %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2805,92 +2879,102 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 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:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Eliminar MOTD"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Insertar la hora:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Grupos de charla"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Debes introducir una contraseña para la nueva cuenta"
 
-#: ../src/config.py:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 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:2963
+#: ../src/config.py:3040
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2899,23 +2983,23 @@ msgstr ""
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con éxito"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2923,255 +3007,264 @@ 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:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, 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:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "hace %i días"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nombre del contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "En el grupo"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Mensajes de estado predefinidos</b>"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escribe tu nuevo mensaje de estado:"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "Dirección"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "Dirección"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Dirección"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "ID de Usuario no válida"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "Identificador:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr "Membris Khan <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "No se pudo entrar al salón"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, 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:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un salón de chat con la cuenta %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/dialogs.py:1185
-msgid "The room Jabber ID has not allowed characters."
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3181,260 +3274,270 @@ msgstr ""
 "un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "No se puede escribir el archivo en %s"
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 #, fuzzy
 msgid "New E-mail"
 msgstr "Correo-e"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "Ninguno"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto desconectado"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Descripción: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato del renglón</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato del renglón</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar conversación"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Nombre de usuario no válido"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Debes introducir una contraseña para la nueva cuenta"
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
+#: ../src/dialogs.py:2220
 #, fuzzy, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s invitado a %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Conexión"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexión no puedes navegar los servicios disponibles"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestión de servicios usando la cuenta %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "El servicio no fue encontrado"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3442,51 +3545,70 @@ 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:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "El servicio no es navegable"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "usando la cuenta %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Descripción"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "_Añadir"
+
+#: ../src/disco.py:1738
+#, fuzzy
+msgid "New post"
+msgstr "Nuevo salón"
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Añadir"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Añadir"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Archivo"
@@ -3512,7 +3634,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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Tú"
 
@@ -3522,7 +3644,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Recipiente: "
 
@@ -3589,32 +3711,32 @@ msgstr "Descripción: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quiere enviarte un archivo:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Este archivo ya existe"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3650,12 +3772,11 @@ msgstr "Archivo: "
 msgid "It is not possible to send empty files"
 msgstr "No es posible enviar archivos vacíos"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Remitente: "
 
@@ -3663,31 +3784,31 @@ msgstr "Remitente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim necesita Xserver para funcionar. Abortando..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim necesita PyGTK 2.6 o superior"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim necesita GTK 2.6 o superior"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La biblioteca GTK+ necesita soporte de libglade"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3696,7 +3817,7 @@ msgstr ""
 "Por favor elimina tu actual biblioteca GTK+ e instala la última versión "
 "estable desde %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -3704,16 +3825,16 @@ msgstr ""
 "Por favor, asegúrate de que gtk y pygtk tienen soporte de libglade en este "
 "sistema."
 
-#: ../src/gajim.py:70
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necesita PySQLite2 para funcionar"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necesita PySQLite2 para funcionar"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3721,86 +3842,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorización HTTP (%s) para %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Conexión"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, fuzzy, python-format
 msgid "error while sending %s ( %s )"
 msgstr "error durante el envío"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Siempre le verás desconectado."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s está ahora %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3810,56 +3931,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "No hay disponible una conexión"
+
+#: ../src/gajim.py:2095
 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)"
 
@@ -3882,7 +4008,8 @@ msgid "Shows or hides the roster window"
 msgstr "Muestra u oculta la ventana de la lista de contactos"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Levanta una venana con el siguiente mensaje sin leer"
 
 #: ../src/gajim-remote.py:82
@@ -4219,8 +4346,8 @@ msgstr "Falló el envío del mensaje privado"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Ya no estás en el salón \"%s\" o \"%s\" ya no existe."
 
 #: ../src/groupchat_control.py:141
@@ -4238,98 +4365,99 @@ msgid "Insert Nickname"
 msgstr "Cambiar _Alias"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s es ahora conocido como %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "En el grupo"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s está ahora %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alias no encontrado: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Este salón no tiene tema"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, 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:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Uso: /%s <alias|JID> [motivo], expulsa el JID del salón. El alias de un "
 "ocupante puede ser sustituido, pero no si contiene \"@\". Si el JID está "
 "actualmente en el salón, el/ella puede ser también expulsado. NO soporta "
 "espacio en el alias."
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4337,12 +4465,12 @@ msgstr ""
 "Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpia de texto la ventana."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4351,21 +4479,21 @@ msgstr ""
 "Uso: /%s [motivo], cierra la ventana o pestaña actual, mostrando el motivo "
 "si se especifica."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, limpia de texto la ventana."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Uso: /%s <JID> [reason], invita al JID al salón actual, opcionalmente "
 "proveyendo un motivo."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4374,26 +4502,26 @@ msgstr ""
 "Uso: /%s <salón>@<servidor>[/alias], ofrece la entrada a salón@servidor "
 "opcionalmente usando el alias especificado"
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 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:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 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:1241
+#: ../src/groupchat_control.py:1246
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4402,91 +4530,93 @@ 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:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <alias>, cambia tu alias en el salón actual."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salón."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salón."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, 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:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "No hay información de ayuda para /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "¿Estás seguro de querer abandonar el salón \"%s\"?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Si cierras esta ventana, serás desconectado de este salón."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_No preguntarme otra vez"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Marcador ya definido"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, 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:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Marcador añadido con éxito"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
@@ -4517,78 +4647,78 @@ msgstr "Detalles"
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Error leyendo el archivo:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar archivo como..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "creando base de datos de registros"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 #, fuzzy
 msgid "Contacts"
 msgstr "Contacto:"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Fecha"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 #, fuzzy
 msgid "Nickname"
 msgstr "Alias:"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Mensaje"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 #, fuzzy
 msgid "Subject"
 msgstr "Tema:"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:184
+#: ../src/history_manager.py:188
 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 "
@@ -4597,27 +4727,27 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Migrando el registro..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
@@ -4648,12 +4778,12 @@ msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 #, fuzzy
 msgid "Messages"
 msgstr "Mensaje"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
@@ -4693,46 +4823,46 @@ msgstr ""
 msgid "New Message from %(nickname)s"
 msgstr "Nuevo mensaje como %s "
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Invitación recibida"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "falló la publicación de la vCard"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4740,99 +4870,100 @@ msgstr ""
 "Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
 "nuevo más tarde."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "No puedes entrar a un salón de chat estando invisible"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "usando la cuenta %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Gestionar marcadores..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, 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
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:1262
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 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:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4840,72 +4971,122 @@ msgid ""
 msgstr ""
 "Ya no podrás enviar y recibir mensajes a contactos desde este transporte"
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Contacto:"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Introduce contraseña GPG para la cuenta %s"
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "Renombrar"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Introduce contraseña GPG para la cuenta %s"
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Eliminar"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Elimina contacto del roster"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Nuevo salón"
+msgid "_New group chat"
+msgstr "Grupos de charla"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 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:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Nuevo mensaje"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Re_nombrar"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "Usuarios _online"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido eliminada"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -4914,7 +5095,7 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4922,17 +5103,17 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2629
 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:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4941,33 +5122,33 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:2411
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Introduce contraseña GPG para la cuenta %s"
 
-#: ../src/roster_window.py:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Guardar contraseña"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Contraseña"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 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:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4975,20 +5156,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:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4996,111 +5177,134 @@ msgstr ""
 "Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
 "histórico activado"
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr "Debes crear una cuenta antes de poder conversar con otros contactos."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De %s en el salón %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Cambiar mensaje de estado..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Rol: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Oculta este menú"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Afiliación: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "ID de Jabber:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "_Iconos de estado por defecto:"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Navegando %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "ID de Jabber:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Subscripción: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
+
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Detenido"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Completado"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 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:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5108,25 +5312,25 @@ msgstr ""
 "Este servicio podría no responder con información detallada.\n"
 "Posiblemente es antiguo o está roto"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Navegando %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Afiliación: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5134,7 +5338,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:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5142,14 +5346,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:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5157,122 +5361,122 @@ msgstr ""
 "No estás interesado en la presencia del contacto y el/ella tampoco lo está "
 "en el tuyuo"
 
-#: ../src/vcard.py:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "creando base de datos de registros"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, 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:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim se cerrará ahora"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, 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:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "creando directorio %s"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, 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:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Ausente por inactividad"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "No disponible por inactividad"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Si es True, no elimiina */_ . Entonces *abc* será negrita, pero sin eliminar "
 "* *"
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "¿Añadir * y [n] en el título del roster?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5280,12 +5484,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:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5293,11 +5497,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:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Cuántas líneas almacenar para Ctrl+Arriba."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5306,36 +5510,55 @@ msgstr ""
 "URL personalizada con %s donde %s es la palabra/frase o 'WIKTIONARY' que "
 "significa usar wiktionary"
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:153
 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:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 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:156
+#: ../src/common/config.py:160
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5343,32 +5566,36 @@ 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:162
+#: ../src/common/config.py:166
 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:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "¿Mostrar pestaña cuando sólo hay una conversación?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, 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:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "¿Mostrar botón de cerrar en la pestaña?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Una lista de palabras separadas por ';' que serán resaltadas en las "
 "conversaciones de varios usuarios."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5377,11 +5604,11 @@ msgstr ""
 "pulsado. Esta preferencia sólo se activa si se usa el icono del área de "
 "notificación. "
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Si es True, Gajim registra xmpp:// en cada inicio."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5389,7 +5616,7 @@ msgstr ""
 "Si es True, Gajim mostrará un icono en cada pestaña que contenga mensajes "
 "sin leer. Dependiendo del tema, este icono puede ser animado."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5398,7 +5625,7 @@ msgstr ""
 "Si es True, Gajim mostrará el mensaje de estado, si no está vacío, para cada "
 "contacto bajo su nombre en la lista de contactos."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5406,7 +5633,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:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5415,43 +5642,52 @@ 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:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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:201
+#: ../src/common/config.py:207
 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5462,217 +5698,229 @@ msgid ""
 "the changes will take effect."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:212
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:213
 #, fuzzy
 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:208
+#: ../src/common/config.py:214
 #, 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:209
+#: ../src/common/config.py:215
 #, 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:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat 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."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estoy disfrutando la vida"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "En línea"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Libre para hablar"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Servicio no disponible"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 #, fuzzy
 msgid "Bye!"
 msgstr "Ocupado"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 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: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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr ""
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Contraseña"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5683,49 +5931,54 @@ msgstr ""
 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
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "No se pudo entrar al salón"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 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."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Estás expulsado de este salón"
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "No existe el salón."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "La creación de salones está restringida."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Es necesario usar el alias registrado."
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "No estás en la lista de miembros"
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5733,27 +5986,27 @@ 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
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos ahora suscritos a %s"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "petición de eliminación de suscripción de %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ya no estamos suscritos a %s"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5763,91 +6016,89 @@ msgstr ""
 "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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, 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:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"Para continuar enviando y reciviendo mensajes, necesitarás volver a conectar."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
 #, python-format
-msgid "Transport %s answered wrongly to register request."
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Contraseña no válida"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado al servidor %s:%s con %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexión o inténtalo más tarde"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "No se ha facilitado la clave OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "invisible"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "desconectado"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "Estoy %s"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Este mensaje está encriptado]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5856,16 +6107,16 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 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
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Las capacidades D-Bus de Gajim no pueden ser usadas"
 
@@ -6052,242 +6303,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Caracter no válido en el nombre de usuario."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Se requiere la dirección del servidor."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Carácter no válido en el nombre del host."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Carácter no válido en el recurso."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr ""
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr ""
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr ""
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "En líne_a"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "En línea"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "Tiene errores"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Salón:"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Propietario"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrador"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Miembro"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6298,47 +6549,116 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "error: no se puede abrir %s para lectura"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr ""
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr ""
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "creando base de datos de registros"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "para la cuenta %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "La conexión con el cliente no se pudo establecer."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+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/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "No se pudo entrar al salón"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "No se puede conectar a \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Este mensaje está encriptado]"
 
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "error durante el envío"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Nuevo salón"
+
+#~ msgid "Role: "
+#~ msgstr "Rol: "
+
+#~ msgid "Affiliation: "
+#~ msgstr "Afiliación: "
+
+#~ 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 ""
+#~ "Sonido a reproducir cuando se recibe cualquier mensaje MUC. (Esta "
+#~ "preferencia sólo se activa si notify_on_all_muc_messages es False)"
+
 #~ msgid "Contact _Info"
 #~ msgstr "_Información"
 
@@ -6408,9 +6728,6 @@ msgstr "[Este mensaje está encriptado]"
 #~ msgid "zh_CN"
 #~ msgstr "chino (China)"
 
-#~ msgid "New Room"
-#~ msgstr "Nuevo salón"
-
 #, fuzzy
 #~ msgid "Jabber ID"
 #~ msgstr "ID de Jabber:"
@@ -6435,9 +6752,6 @@ msgstr "[Este mensaje está encriptado]"
 #~ 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"
@@ -6447,9 +6761,6 @@ msgstr "[Este mensaje está encriptado]"
 #~ msgid "Since %s"
 #~ msgstr "Tamaño: %s"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Añadir"
-
 #, fuzzy
 #~ msgid "Add"
 #~ msgstr "Dirección"
@@ -6473,10 +6784,6 @@ msgstr "[Este mensaje está encriptado]"
 #~ msgid "Up"
 #~ msgstr "Arriba"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Eliminar MOTD"
-
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migrando el registro..."
 
@@ -6555,9 +6862,6 @@ msgstr "[Este mensaje está encriptado]"
 #~ "Si está marcado, Gajim alojará un icono en el área de notificación del "
 #~ "sistema"
 
-#~ msgid "_Online Users"
-#~ msgstr "Usuarios _online"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Iniciar conversación con la cuenta %s"
@@ -6695,9 +6999,6 @@ msgstr "[Este mensaje está encriptado]"
 #~ msgid "Chat with"
 #~ msgstr "Charlar con"
 
-#~ msgid "Send New Message"
-#~ msgstr "Nuevo mensaje"
-
 #~ msgid "as %s"
 #~ msgstr "como %s"
 
diff --git a/po/eu.po b/po/eu.po
index fa5432840..ab105bc69 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\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"
@@ -43,22 +43,26 @@ msgid "_Discover Services..."
 msgstr "_Zerbitzuak Aurkitu..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "Txat _Taldea"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Kontua E_ditatu"
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Ireki E-posta Konposatzailea"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Egoera"
@@ -244,16 +248,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Orokorra"
 
@@ -315,17 +321,17 @@ msgid "Manage..."
 msgstr "Moldatu..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ezer ez"
 
@@ -605,11 +611,12 @@ msgid "Advanced Notifications Control"
 msgstr "Notifikazio Aurreratuaren Kontrola"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
-msgid "All Status "
+#, fuzzy
+msgid "All statuses"
 msgstr "Egoera Guztiak"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Kanpoan"
 
@@ -626,7 +633,7 @@ msgid "Have "
 msgstr "daukadanean"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Ikusezin"
 
@@ -635,19 +642,24 @@ msgid "Launch a command"
 msgstr "Abiarazi agindua"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Ez Erabilgarri"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+#, fuzzy
+msgid "One or more special statuses..."
+msgstr "Egorera berezi bat(zuk)..."
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 msgid "Online / Free For Chat"
 msgstr "Libre / Libre Hitz Egiteko"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid "Play a sound"
 msgstr "Soinua ezarri"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -669,16 +681,14 @@ msgstr ""
 "Fitxero Transferentzia Hastean\n"
 "Fitxero Transferentzia Bukatzean"
 
-#: ../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:27
 msgid "When "
 msgstr "Denean"
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+#, fuzzy
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -737,7 +747,8 @@ msgid "for "
 msgstr "norentzat"
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+#, fuzzy
+msgid "when I'm in"
 msgstr "Nagoenean"
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -771,7 +782,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Zerrendara Sartu"
 
@@ -794,7 +805,7 @@ msgstr "Web-ean _Ireki Lotura"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "Elkarrizketa  _Hasi"
 
@@ -803,7 +814,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Bidali _Fitxeroa"
@@ -820,12 +831,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historiala"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "talde hontakoak"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Gelaren Konfigurazioa"
 
@@ -914,11 +930,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Elkarrizketako Egoeren Koloreak</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Kontua\n"
 "Taldea\n"
@@ -969,7 +986,7 @@ msgstr ""
 "MUC Zuzendua\n"
 "Mezuak"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Etena"
 
@@ -1108,14 +1125,14 @@ msgstr "Ukatu"
 msgid "Invitation Received"
 msgstr "Gonbidapena Jasoa"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Izengoitia:"
 
@@ -1133,8 +1150,8 @@ msgstr "Berriki:"
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Sartu"
 
@@ -1184,7 +1201,7 @@ msgstr "Proxy Profila Moldatu"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Izena:"
 
@@ -1200,14 +1217,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Aukerak"
 
@@ -1307,10 +1324,12 @@ msgid "Auto _not available after:"
 msgstr "Automatikoki _Ez Erabilgarri ondoren:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Autodetektatu Gajim abiarazten den bakoitzean\n"
@@ -1318,18 +1337,14 @@ msgstr ""
 "Beti KDE-ren berezko aplikazioak erabili\n"
 "Bezeroa"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "Izengoitia baino l_ehen:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Txat"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "Txateko egoeraren ja_kinaraztea:"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1340,39 +1355,59 @@ msgstr ""
 "Kontu handiz erabili, zerrendan ez dagoen edonoren mezuak blokeatzen ditu"
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Egoera Mezua"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "Berezko egoera _ikurra:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr "Erakutsarazi epostaren g_ehigarrizko xehetasunak"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Txateko egoeraren ja_kinaraztea:"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "5 _minuturo"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Emoticonoak:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Gertaerak"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+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:43
 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 "
@@ -1382,13 +1417,13 @@ msgstr ""
 "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
+#: ../data/glade/preferences_window.glade.h:44
 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
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1396,13 +1431,13 @@ msgstr ""
 "Gajim-ek gertaera berriez jakinaraziko dizu popup bidez pantailaren beheko "
 "eskubiko aldean"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:46
 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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1410,19 +1445,19 @@ msgstr ""
 "Deskonektatu diren kontaktuez Gajim-ek jakinaraziko dizu popup bidez "
 "pantailako beheko eskubiko aldean"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:48
 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
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1430,7 +1465,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1438,7 +1473,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
 "azpian eta txat taldeetan"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1446,7 +1481,7 @@ 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
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1456,7 +1491,7 @@ msgstr ""
 "ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
 "jarriko dira)"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1464,11 +1499,15 @@ msgstr ""
 "Ez badago ezeztatuta, Gajim-ek  ´:)´ ascii hauek bere irudi grafiko estatiko "
 "edo animatura eraldatuko ditu"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "Mo_ldatu..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1480,83 +1519,94 @@ msgstr ""
 "Kontuko\n"
 "Gaiaz"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Notify on new _GMail email"
 msgstr "_Gmail-eko E-posta berri batez jakinarazi"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "Mezu _guztietan"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "M_ezu leiho bat"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Txateko egoeraren ja_kinaraztea:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Soinuak _entzun"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Imprimatu ordua:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Ikusi _zerrendan bakarrik"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "_Konektatuta"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "_Deskonektatuta"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Egoera"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "G_aia:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Automatikoki kanpoko egoera mezua"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Automatikoki ez erabilgarriko egoera mezua"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Erabili _transporteen ikurrak"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr "_Sistemaren berezkoa erabili"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "E_rabili ikonifikazioa (aka. notification area)"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1568,95 +1618,101 @@ msgstr ""
 "jakinaraztea, bakarrik, dagoeneko hitz egiten ari zaren pertsona batekin "
 "izan ezik izango da"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Ekintza berri bat jasotzean."
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Advanced Notifications Control..."
 msgstr "Notifikazio _Aurreratuaren Kontrola..."
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "Ordu_aren ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "Ordua _baino lehen:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Bilatu:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Fitxero administratzaile:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Mota:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "_Sarrerako mezua:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Email bezeroa"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Inoiz"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Jakinarazi horri buruz"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Ireki..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "Kanp_oan nagoeneko mezua:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Entzun"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Agertarazi"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "Be_rezko Koloreak Ezarri"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "_Sailkatu kontaktuak egoeraren bidez"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "Egoera mezua:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minutu"
 
@@ -1686,7 +1742,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "K_onektatu Gajim irikitzean"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr "Dena"
 
@@ -1702,7 +1758,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Ordena:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr "Debekatze Zerrenda"
 
@@ -1769,116 +1825,116 @@ msgid "City:"
 msgstr "Hiria:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Konpainia:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Estatua:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Departamentua:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Helbide Gehigarria:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Emandako izena:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Web Pertsonala:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Erdi izena:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Gehiago"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Informazio Pertsonala "
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefono Zenbakia:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Tokia:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Posta Kodea:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Aurreizkia izenean:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Eginkizuna:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Egoera:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Kalea:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Atzizkia izenean:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Lana"
 
@@ -1918,45 +1974,52 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Editatu _Taldeak"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Bidali Mezu _Bakarra"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Elkarrizketa _Hasi"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "_Allow him/her to see my status"
 msgstr "Baimendu nire egoera ikustea"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 msgid "_Forbid him/her to see my status"
 msgstr "Debekatu nire egoera ikustea"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Zerrendatik Ezabatua"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Berrrizenpetu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Harpidetza"
 
@@ -2002,8 +2065,8 @@ msgstr "_Edukiak"
 msgid "_Discover Services"
 msgstr "_Zerbitzuak Aurkitu"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Editatu"
 
@@ -2093,34 +2156,40 @@ msgid "_Send & Close"
 msgstr "_Bidali eta Itxi"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Autorizatu"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Harpidetza Eskaria"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Autorizatu"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Ukatu"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Wav Soinuak"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Ikusi Gabeko _Gertaerak"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Ikusi _Zerrenda"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "E_goera"
 
@@ -2133,38 +2202,43 @@ msgstr "Eskatua:"
 msgid "Client:"
 msgstr "Bezeroa:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Azalpenak: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Baliabidea:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Egoera:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Harpidetza:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "Elkarrizketaren _historiala"
@@ -2358,7 +2432,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2387,49 +2461,49 @@ msgstr "Konexioa ez dago erabilgarri"
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: ../src/chat_control.py:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Txat-ak"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Ez dago zerrendan"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2437,98 +2511,103 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Ezindu"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "%s _minuturo"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Aktibatuta"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Konexioa ez dago erabilgarri"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Lehen Mezu Jasoa"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Kontaktua Konektatuta"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Gonbidapena Jasoa"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Irakurri gabeko gertaerak"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Kontuko izena aldatzeko,  irakurri gabeko gertaera guztiak irakurri behar "
 "dituzu."
 
-#: ../src/config.py:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Kontu Izena Jadanik Erabilia"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2536,175 +2615,175 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Birkargatu orain?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Momentuan aldaturiko aukerak ezarri nahi badituzu, birkargatu beharko duzu."
 
-#: ../src/config.py:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Giltzaren Aukera"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Kontu Izena Jadanik Erabilia"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Partaide Zerrenda"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Arrazoia"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Izengoitia"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Eginkizuna"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Debekatzen..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2712,11 +2791,11 @@ msgstr ""
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2724,11 +2803,11 @@ msgstr ""
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2736,11 +2815,11 @@ msgstr ""
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2748,7 +2827,7 @@ msgstr ""
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2764,315 +2843,324 @@ msgstr ""
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+msgid "Default"
+msgstr "Berezkoa"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Inprimatu egoera:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Txat Taldea"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Kontu berrirako pasahitz bat sartu behar duzu."
 
-#: ../src/config.py:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
-#: ../src/config.py:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Bikoiztutako Jabber ID "
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Kontaktu hau dagoeneko Gajim-en konfiguratua dago."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 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:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\" -rako aukerak"
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "%i egun lehenago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktuaren izena: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Taldea"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "Taldean"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "ID kodea"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Kontaturen izena"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Egoera Mezua"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Aurrez Ezarritako Mezua Jarri"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Mesedez ezarri izen bat egoera mezu honetarako"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Helbidea:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Helbidea:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Helbide Gehigarria:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportea"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Bezero ID Baliogabea"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "ID erabiltzaileak ez du baliabiderik eraman behar."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "E_rabiltzailearen ID:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber bezeroa"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr "GTK+ Bertsioa:"
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr "PyGTK Bertsioa:"
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 msgid "Current Developers:"
 msgstr "Egungo diseinatzaileak: "
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Aurre diseinatzaileak: "
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "ESKERRAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Unable to bind to port %s."
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
@@ -3080,50 +3168,59 @@ msgstr ""
 "Beharbada beste Gajim prozesu bat abiarazita duzu. Fitxero transferentzia "
 "bertan behera utziko da."
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Txat Taldera Sartu %s kontuarekin"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gela izenak edo zerbitzariak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Ezkutatu banner-a txat talde leihoan"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Elkarrizketa Hasi %s kontuarekin"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3133,253 +3230,263 @@ msgstr ""
 "kontaktuaren jid-a edota izengoitia:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 msgid "Invalid JID"
 msgstr "JID Baliogabea"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Mezu Berria Bat"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Mezu Berri Bat"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 msgid "Contact Changed Status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mezu Bakarra %s Kontuarekin"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mezu Bakarra %s Kontuarekin"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsola %s-rena"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr " XML Konsola"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Debekatze Zerrenda <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Arau bat editatu</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ezarri Araua</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Baliogabeko izena"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Kontu berrirako pasahitz bat sartu behar duzu."
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Aukeratu Irudia"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s bihurtzen denean:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 #, fuzzy
 msgid "when I am "
 msgstr "Nagoenean"
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Besteak"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Solasaldiak"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Konektatu gabe ezin duzu zerbitzari erabilgarriak bilatu"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Zerbitzua Aurkitua"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3387,51 +3494,69 @@ msgstr ""
 "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
 "helbidea eta saiatu berriro."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 msgid "This type of service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du menurik begiratzeko."
 
-#: ../src/disco.py:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Begiratzen %s  %s kontua erabiliz"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Bilatu"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Eskaneatzen  %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Erabiltzaileak"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Deskribapena"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Harpidetu"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Harpidetu"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Harpidetu"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Fitxeroa"
@@ -3457,7 +3582,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Zu"
 
@@ -3467,7 +3592,7 @@ msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
@@ -3534,32 +3659,32 @@ msgstr "Deskribapena: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s fitxero bat bidali nahi dizu:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ezin izan da gainarazi \"%s\" fitxeroa"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 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:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" kokapena ez da idazgarria"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr "Ez duzu baimenik kokapen honetan fitxerorik sortzeko."
 
@@ -3595,12 +3720,11 @@ msgstr "Fitxeroa:"
 msgid "It is not possible to send empty files"
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
@@ -3608,31 +3732,31 @@ msgstr "Bidaltzailea: "
 msgid "Pause"
 msgstr "Etena"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim-ek Xserver behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ rutinak ez du libglade sostengatzen"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3640,21 +3764,21 @@ msgid ""
 msgstr ""
 "GTK+ rutina ezabatu eta instalatu ezazu azken bertsio establea %s hemendik"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 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
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim-ek PySQLite2 behar du abiarazteko"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim-ek PySQLite2 behar du abiarazteko"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3662,11 +3786,11 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr "Gajim dagoeneko abiarazi da"
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3674,76 +3798,76 @@ msgstr ""
 "Beste Gajim prozesu bat abiarazita dagoela dirudi\n"
 "Abiarazi dena den?"
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Konektatu"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Gaia: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "errorea bidaltzen zen bitartean %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Beti deskonektatuta ikusiko duzu."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s orain %s dago: (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "E-posta Berria %(gmail_mail_address)s -en"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3753,7 +3877,7 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -3762,50 +3886,55 @@ msgstr ""
 "\n"
 "Norengandik: %(from_address)s"
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Konexioa ez dago erabilgarri"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management support not available (missing gnome.ui module)"
 
@@ -3828,7 +3957,8 @@ msgid "Shows or hides the roster window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Agertarazi leiho bat irakurri gabeko hurrengo mezuarekin"
 
 #: ../src/gajim-remote.py:82
@@ -4150,8 +4280,8 @@ msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Ez zaude gela honetan \"%s\" edo \"%s\" joan da."
 
 #: ../src/groupchat_control.py:141
@@ -4167,98 +4297,99 @@ msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s orain %s da"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Gela honek ez du gairik"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, 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:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, 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:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4266,33 +4397,33 @@ msgstr ""
 "Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
 "erabiltzaileari."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Erabilera: %s, testu leihoa itxi."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr "Erabilera: /%s [reason],  itxi leihoa, zergatia erakutsiz behar bada."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Erabilera: /%s <JID> [reason], gonbidatu JID-a oraingo gelara, aukerazko "
 "arrazoi bat emanez. "
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4301,27 +4432,27 @@ msgstr ""
 "Erabilera:  /%s <room>@<server>[/nickname], eskaini room@server-era sartzen "
 "aukeraz izengoiti bat ezarriz."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat 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:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. 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:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4330,93 +4461,95 @@ msgstr ""
 "Erabilera: /%s <nickname> [message], ireki mezu pribatuko leiho bat eta "
 "bidali zehaztutako izengoitiaren erabiltzailera."
 
-#: ../src/groupchat_control.py:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Erabilera:  /%s <nickname>, aldatu zure izengoitia gela hontan."
 
-#: ../src/groupchat_control.py:1250
-#, python-format
-msgid "Usage: /%s , display the names of room occupants."
+#: ../src/groupchat_control.py:1255
+#, fuzzy, python-format
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Erabilera:/%s , erakutsarazi gelako pertsonen izenak."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Erabilera: /%s [topic], erakuts arazi edo aktualizatu oraingo gelako gaia."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Erabilera:  /%s <message>, mezu bat bidali beste komandoak bilatu gabe."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ez dago laguntza informazioa  /%s -rentzat"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "E_z galdetu berriro  "
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Gaia Aldatu"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Izengoitia Aldatu"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Talde agenda ezarria"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "\"%s\" gela zure talde agendan dago."
 
-#: ../src/groupchat_control.py:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Talde agenda egoki sortu da"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
@@ -4447,75 +4580,75 @@ msgstr "Zehaztapenak"
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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."
 
-#: ../src/gtkgui_helpers.py:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, 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?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 msgid "Save Image as..."
 msgstr "Gorde Irudia Bezala..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Ezin izan da aurkitu log-en datu basea"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Kontaktua"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Izengoitia"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Mezua"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Gaia"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 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:184
+#: ../src/history_manager.py:188
 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 "
@@ -4529,27 +4662,27 @@ msgstr ""
 "\n"
 "BAI sakatu baduzu, mesedez itxoin..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Historialeko Log-ak Esportatzen...."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, 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:510
+#: ../src/history_manager.py:514
 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?"
 
-#: ../src/history_manager.py:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Itzulgaitza den operazio bat da hau."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 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?"
@@ -4580,11 +4713,11 @@ msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Mezuak"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4624,46 +4757,46 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Gonbidapena Jasoa"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "vCard argitarapenak hust egin du"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4671,87 +4804,88 @@ msgstr ""
 "Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, "
 "saiatu berriro beranduago."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Begiratzaileak"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "%s kontua erabiliz "
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "%s kontura"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "%s kontua erabiliz"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "%s kontukoa"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Talde Agenda Moldatu..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "%s konturako"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Historial Administratzailea"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, 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
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, 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
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4759,12 +4893,12 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4773,72 +4907,121 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Kontaktua"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Berrrizenpetu"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Ezabatu"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Zerrendatik kontaktua ezabatu"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP Kodea Izendatu"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Gela Berria"
+msgid "_New group chat"
+msgstr "Txat Taldea"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Nire zerrendara nahi nizuke sartu"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "_Bidali Zerbitzarira Mezua"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "_Berrizenpetu"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+msgid "To all online users"
+msgstr ""
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Log aktibatua"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "Log _desaktibatua"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4846,7 +5029,7 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4854,17 +5037,17 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Kontaktu hau ezabatu ondoren nire egoera jakitea nahi dut"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4873,32 +5056,32 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:2411
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
-#: ../src/roster_window.py:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Gorde pasa-esaldia"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4906,131 +5089,155 @@ msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 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:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Bidali %s taldea %s-era"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Egin %s eta %s metacontacts"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Egoera Mezua Aldatu..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Eginkizun:"
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Ezkutatu Menua"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Afizioak: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Baliabideak: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Egoera: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Azken egoera %s-ean"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "noiztik %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Harpidetza: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
+
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Deskargatu"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Kargatu"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Mota: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Transferitua:"
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Hasigabea"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Gelditua"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Osatua"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Tranferitzen"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Zerbitzu honek ez du oraindik erantzun informazio zehaztuz."
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5038,25 +5245,25 @@ msgstr ""
 "Zerbitzu honek ezin izan du erantzun.\n"
 "Seguraski ez du erantzun espero bezala edo ez dabil."
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "noiztik %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Afizioak: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5064,7 +5271,7 @@ msgstr ""
 "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
 "haren egoera informazioan interesatuta"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5072,89 +5279,89 @@ msgstr ""
 "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
 "interesik"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 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:279
+#: ../src/vcard.py:299
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 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:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, 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:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim orain badago"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s direktorio bat da baina fitxero bat izan daiteke"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "%s direktorioa sortzen"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Erabili DBus eta Notification-Daemon jakinarazketak erakusteko."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Ordua minutuetan, zure egoera kanpoan aldatu ondoren."
 
-#: ../src/common/config.py:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Kanpoan beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Ez erabilgarri beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 #, 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:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -5164,7 +5371,7 @@ msgstr ""
 "'sometimes' - inprimatu ordua print_ichat_every_foo_minutes minutuko.\n"
 "'never' - inoiz ez inprimatu ordua."
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:92
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
@@ -5174,23 +5381,23 @@ 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:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
@@ -5199,7 +5406,7 @@ msgstr ""
 "Izengoitiaren ondoren ezartzeko karakterea txat talde batean tab-a "
 "erabiltzen bada"
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
@@ -5208,23 +5415,23 @@ msgstr ""
 "Izengoitiaren ondoren jartzeko proposatzen den karakterea, txat taldean "
 "beste pertsona batek izengoiti berbera badu"
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Sartu * eta [n] zerrendako izenburuan?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 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:142
+#: ../src/common/config.py:144
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Zenbat minutu izan behar ditu azken lerroak  lehengo elkarrizketaren "
 "azkenetik."
 
-#: ../src/common/config.py:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5232,11 +5439,11 @@ msgstr ""
 "Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis "
 "ICQ Client default behaviour)."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5245,11 +5452,30 @@ msgstr ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:153
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Hautatua badago, Gajim gajim-remote erabiliz kontrolatu daiteke."
 
 #: ../src/common/config.py:154
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
 #, fuzzy
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
@@ -5258,27 +5484,29 @@ msgstr ""
 "Ez denean ordua mezu bakoitzeko inprimatzen (print_time==sometimes), "
 "imprimatu x minuturo"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Galdetu leiho bat itxi baino lehen."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5286,31 +5514,36 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 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:170
+#: ../src/common/config.py:168
+#, fuzzy
+msgid "Notify of events in the system trayicon."
+msgstr "Ez erakutsarazi transporteen ikurrak."
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Erakutsi tab-a bakarrik elkarrizketa bat dagoenean?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Isteko botoila erakutsi tab-ean?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5318,11 +5551,11 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Egia bada, Gajim-ek erregistratuko du xmpp:/ abiaraztean."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5330,7 +5563,7 @@ msgstr ""
 "Egia bada, Gajim-ek  ikono bat azalaraziko du leiho horretan irakurri gabeko "
 "mezuak adieraziz. Gaiaren arabera ikonoa animatua izan daiteke."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5339,7 +5572,7 @@ msgstr ""
 "Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
 "kontaktuaren izenaren azpian azalduko dira."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5347,7 +5580,7 @@ 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:192
+#: ../src/common/config.py:196
 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."
@@ -5355,14 +5588,14 @@ msgstr ""
 "Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera "
 "aldaketa egiten duenean edo/eta bere egoera mezua."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:197
 #, 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."
+"group chat."
 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 "
@@ -5370,21 +5603,29 @@ msgstr ""
 "ditu. \"in_and_out\" bada, Gajim-ek sarrera/irteerak inprimatuko ditu "
 "bakarrik"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr "Ez erakutsarazi transporteen ikurrak."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 #, fuzzy
 msgid "Don't show roster in the system taskbar."
 msgstr "Ez erakutsarazi transporteen ikurrak."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5394,17 +5635,18 @@ msgstr ""
 "badira, make the window flash (the default behaviour in most Window "
 "Managers) when holding pending events."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5422,70 +5664,84 @@ msgstr ""
 "'pertype' - Mezuko gaiak(txat edo txat taldekoena adibidez) leiho konkretu "
 "batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi behar da"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 #, 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:206
+#: ../src/common/config.py:212
 #, 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:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Ezkutatu botoiak txat taldeko leihoan"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "Ezkutatu botoilak bi pertsonen txat leihoan "
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Ezkutatu banner-a txat talde leihoan"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Ezkutatu banner-a bi pertsonen txat leihoan "
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "Ezkutatu gelako jendearen zerrenda txat taldeko leihoan"
 
-#: ../src/common/config.py:212
-#, fuzzy
-msgid "Merge consecutive nickname in chat window."
-msgstr "Elkartu hurren hurreneko izengoitia elkarrizketa leihoan"
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 #, fuzzy
 msgid "Indentation when using merge consecutive nickame."
 msgstr "Indentation when using merge consecutive nickame"
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 #, 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
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5493,150 +5749,147 @@ msgstr ""
 "Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
 "file_transfer_proxies-en  fitxero transferentziarako."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Jaten"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Jaten ari naiz, utzi mezu bat beraz."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Filmea"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Lanean"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "kanpoan"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Kanpoan naiz bizitza disfrutatzen"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Libre"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Ez Erabilgarri"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat 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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "berdea"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "gizakia"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "arrantzale"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Pasa-esaldi okerra"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5647,49 +5900,54 @@ msgstr ""
 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
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Ezin da gela honetara sartu"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "Pasahitza behar da gela onetan sartzeko."
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Honako gela honek ez du existitzen."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "Gela sortzea mugatua dago."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Erregistratutako izengoitia erabilia izan behar da."
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Ez zaude kideen zerrendan."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5697,27 +5955,27 @@ msgstr ""
 "Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
 "Mesedez ezarri beste izengoiti bat:"
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s -ra harpidetuak gaude orain"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Harpidetza kentzekoa eskaera %s -tik"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s -ren harpidetzatik kenduta gaude"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5726,89 +5984,87 @@ 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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Erantzun baliogabea"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "%s zerbitzarira konektatu: %s %s -ekin"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Begira ezazu zure konexioa edo saiatu berriro"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP pasa-esaldia ez da eman"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "ikusezin"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "deskonektatuta"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "%s naiz"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5817,16 +6073,16 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim-en D-Bus gaitasun funtzioa ezin da erabili"
 
@@ -6016,242 +6272,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Baliogabeko karakterea izenean."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Zerbitzariaren helbidea behar da."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Baliogabeko karakterea hostname -ean."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gib"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "Lan_petuta"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "Ez E_rabilgarri"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "Libre _Hitz Egiteko"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Libre"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Libre"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "_Kanpoan"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Deskonektatuta"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "Ikuse_zin"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "Ezin da jakin"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "Errorea du"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Norentzat"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "-etik"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Biak"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderatzaileak"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderatzailea"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Partaideak"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Bisitariak"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Bisitaria"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Jabea"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administratzailea"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Partaidea"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "arreta jartzen ari da elkarrizketara"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "beste zerbait egiten ari da"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "mezuaren sorrera gelditua"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6262,50 +6518,120 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "logs-en datu basea sortzen"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "%s kontukoa"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Connection with peer cannot be established."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, 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
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Unable to bind to port %s."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Harpidetu"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "errorea bidaltzen zen bitartean %s ( %s )"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Gela Berria"
+
+#~ msgid "Role: "
+#~ msgstr "Eginkizun:"
+
+#~ msgid "Affiliation: "
+#~ msgstr "Afizioak: "
+
+#, fuzzy
+#~ msgid "Merge consecutive nickname in chat window."
+#~ msgstr "Elkartu hurren hurreneko izengoitia elkarrizketa leihoan"
+
+#~ 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)"
 
 #~ msgid "Add"
 #~ msgstr "Gehitu"
@@ -6325,9 +6651,6 @@ msgstr "[Mezu hau enkriptatua dago]"
 #~ msgid "Up"
 #~ msgstr "Gora"
 
-#~ msgid "Default"
-#~ msgstr "Berezkoa"
-
 #~ msgid "Create your own Privacy Lists"
 #~ msgstr "Sortu zure debekatze zerrenda"
 
@@ -6364,9 +6687,6 @@ msgstr "[Mezu hau enkriptatua dago]"
 #~ 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"
diff --git a/po/fr.po b/po/fr.po
index fdd1b5334..fd4d4c693 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-04-20 17:23+0100\n"
 "Last-Translator: Yann Le Boulanger <asterix@lagaule.org>\n"
 "Language-Team: \n"
@@ -45,22 +45,26 @@ msgid "_Discover Services..."
 msgstr "_Découvrir les services..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Salons de discussion"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modifier le compte..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Ouvrir le logiciel de Courriel"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "É_tat"
@@ -248,16 +252,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Général"
 
@@ -319,17 +325,17 @@ msgid "Manage..."
 msgstr "Gérer..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Aucun"
 
@@ -608,11 +614,12 @@ msgid "Advanced Notifications Control"
 msgstr "Éditeur de configuration avancée"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
-msgid "All Status "
+#, fuzzy
+msgid "All statuses"
 msgstr "Tous les états "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Absent"
 
@@ -629,7 +636,7 @@ msgid "Have "
 msgstr "Ai"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -639,19 +646,23 @@ msgid "Launch a command"
 msgstr "commande"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Non disponible"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 msgid "Online / Free For Chat"
 msgstr "En ligne / Disponible pour discuter"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid "Play a sound"
 msgstr "Jouer un son"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -664,16 +675,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr "Quand"
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -734,7 +742,7 @@ msgid "for "
 msgstr "Port : "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -768,7 +776,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Ajouter à la liste de contacts"
 
@@ -791,7 +799,7 @@ msgstr "_Ouvrir le Lien dans votre navigateur"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "Commencer une _discussion"
 
@@ -800,7 +808,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Envoyer un _fichier"
@@ -817,12 +825,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historique"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "Dans le groupe"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Configuration du salon de discussion"
 
@@ -911,11 +924,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Couleurs des Onglets</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Compte\n"
 "Groupe\n"
@@ -967,7 +981,7 @@ msgstr ""
 "Dirigés dans\n"
 "les salons"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Pause"
 
@@ -1108,14 +1122,14 @@ msgstr "Refuser"
 msgid "Invitation Received"
 msgstr "Invitation reçue"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Surnom :"
 
@@ -1133,8 +1147,8 @@ msgstr "Récemment :"
 msgid "Room:"
 msgstr "Salon :"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "Re_joindre"
 
@@ -1185,7 +1199,7 @@ msgstr "Gérer les profils de proxies"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Nom :"
 
@@ -1201,14 +1215,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "Ac_tions"
 
@@ -1310,10 +1324,12 @@ msgid "Auto _not available after:"
 msgstr "Passer _indisponible après :"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Détection automatique à chaque démarrage\n"
@@ -1321,18 +1337,14 @@ msgstr ""
 "Toujours utiliser les applications par défaut de KDE\n"
 "Personnalisé"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "Avant le surnom :"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Discussion"
 
-#: ../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:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1344,39 +1356,59 @@ msgstr ""
 "messages des contacts qui ne sont pas dans votre liste"
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Message d'état"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "_Icônes d'état par défaut :"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 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:36
+#: ../data/glade/preferences_window.glade.h:37
 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:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Noti_fications d'état de discussion"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "Toutes les 5 minutes"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Émoticônes :"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Événements"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim peut envoyer et recevoir des meta-informations concernant les "
+"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:43
 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 "
@@ -1386,14 +1418,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:41
+#: ../data/glade/preferences_window.glade.h:44
 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:42
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1401,7 +1433,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:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1409,7 +1441,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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1417,19 +1449,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:45
+#: ../data/glade/preferences_window.glade.h:48
 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1437,7 +1469,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:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1445,7 +1477,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:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1453,7 +1485,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1463,7 +1495,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:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1471,11 +1503,15 @@ 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:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "_Gérer..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1487,86 +1523,97 @@ msgstr ""
 "Par compte\n"
 "Par type"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Me Signaler quand un contact se : "
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Me prévenir lorsqu'un nouveau courrier électronique _Gmail arrive"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "À _chaque message"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "Une seule fenêtre de discussion :"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Noti_fications d'état de discussion"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "_Jouer les sons"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Afficher l'heure :"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Ne le montrer que dans la _liste"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "_connecte"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "_déconnecte"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "État"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "T_hème :"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Le message automatique pour l'état \"absent\""
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Le message automatique pour l'état \"non disponible\""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Utiliser les icônes des passere_lles"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Icône dans la zone de notification (trayicon)"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1578,96 +1625,102 @@ 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:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Quand un nouvel événement est reçu"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Éditeur de configuration avancée"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_Après l'heure :"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "A_vant l'heure :"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "Gestionnaire de _fichiers :"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Police :"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Souligner les fautes d'orthographe"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "Message _entrant :"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Inscrire dans l'historique les changements d'état des contacts"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "Logiciel de courriel :"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Jamais"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "Me le _signaler"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "Message s_ortant :"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Programme pour lire les sons :"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "L'_afficher"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "Utilise_r les Couleurs par Défaut"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "Trier les contacts par _statut"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "Message d'état :"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL :"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minutes"
 
@@ -1698,7 +1751,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "C_onnexion au démarrage"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1716,7 +1769,7 @@ msgstr "Identifiant Jabber :"
 msgid "Order:"
 msgstr "Serveur :"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "Liste des Bannis"
@@ -1785,116 +1838,116 @@ msgid "City:"
 msgstr "Ville :"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Entreprise :"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Pays :"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Département :"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Adresse 2 :"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Prénom :"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Site perso :"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Second prénom :"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Complément"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Informations personnelles"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Téléphone :"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Poste :"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Code postal :"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Titre :"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Fonction :"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "État :"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Rue :"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Suffixe :"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Emploi"
 
@@ -1935,47 +1988,54 @@ 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
+#: ../src/roster_window.py:1996
 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"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Envoyer un _message simple"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Commencer une _discussion"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "L'autoriser à voir mon état"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Lui interdire de voir mon état"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Enlever de la liste de contacts"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Autorisation"
 
@@ -2021,8 +2081,8 @@ msgstr "_Sommaire"
 msgid "_Discover Services"
 msgstr "_Découvrir les services"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "É_dition"
 
@@ -2112,36 +2172,42 @@ msgid "_Send & Close"
 msgstr "_Envoyer et Fermer"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Autoriser"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Requête d'Inscription"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Autoriser"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Refuser"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Sons wav"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Montrer tous les _événements en attente"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Montrer la _liste de contacts"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "É_tat"
 
@@ -2154,38 +2220,43 @@ msgstr "Demande :"
 msgid "Client:"
 msgstr "Client :"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Commentaire : %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Contacts"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Identifiant Jabber :"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "Syst. d'exploit. :"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ressource :"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "État :"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Inscription :"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Historique de Conversation"
@@ -2379,7 +2450,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2408,50 +2479,50 @@ msgstr "Aucune connexion disponible"
 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:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Discussions"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Chiffrement activée"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Chiffrement désactivée"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Absent de la liste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, 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:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2459,272 +2530,277 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Toutes les %s _minutes"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "texte du message d'état :"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Premier Message Reçu"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Message Suivant Reçu"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Contacte Connecté"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Contacte Déconnecté."
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Message Envoyé"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Message d'un Salon Reçu"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Invitation reçue"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 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:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Événements non lus"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 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:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Nom de Compte déjà utilisé"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 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:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 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:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Revient de suite."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Reconnecter maintenant ?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 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:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 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:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Sélection d'une clé OpenPGP"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "Lisez tous les évènements avant de supprimer ce compte."
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vous n'avez aucun compte actif"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nom de Compte déjà utilisé"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Liste des Bannis"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Liste des Membres"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Liste des Propriétaires"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Liste des Administrateurs"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Raison"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Rôle"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Bannissement de ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2732,11 +2808,11 @@ msgstr ""
 "<b>Qui voulez-vous bannir ?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Ajout d'un Membre ..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2744,11 +2820,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un membre ?</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Ajout d'un Propriétaire ..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2756,11 +2832,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un propriétaire ?</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Ajout d'un Administrateur ..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2768,7 +2844,7 @@ msgstr ""
 "<b>De qui voulez-vous faire un administrateur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2785,89 +2861,99 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Supprimer"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Afficher l'heure :"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Salon de Discussion"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 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:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 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:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 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:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Identifiant Jabber dupliqué"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Ce compte est déjà configuré dans Gajim."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2876,23 +2962,23 @@ msgstr ""
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2900,257 +2986,266 @@ 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:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Actions pour \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, 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:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "Il y a %i jours"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nom du contact : <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Groupe"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "Dans le groupe"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "Message d'état %s"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Message d'état"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Enregistrer comme messages d'état prédéfini"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Tapez un nom pour ce message d'état"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adresse :"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adresse :"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Adresse 2 :"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Passerelles"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Identifiant utilisateur non valide"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Contact déjà dans la liste"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Le contact est déjà dans votre liste."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "_Identifiant :"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Anciens développeurs :"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Anciens développeurs :"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "MERCI :"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr ""
 "Yann Le Boulanger <asterix@lagaule.org>\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, 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:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un salon de discussion en tant que %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Le nom du salon ou du serveur contient des caractères interdits."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Cacher les boutons dans la fenêtre de discussion"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3160,258 +3255,268 @@ msgstr ""
 "envoyer un message"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nouveau message"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "nouveau courrier électronique"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de Fichier"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Transfert de Fichier Terminé"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Transfert de Fichier Arrêté"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Invitation à un salon"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contact déconnecté"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Message simple"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Description : %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Format d'une ligne de discussion</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Format d'une ligne de discussion</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Conversations privées"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Nom d'utilisateur non valide"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Vous devez entrer un mot de passe pour enregistrer un nouveau compte."
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s vous a invité dans le salon %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quand %s devient :"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Ajout de notifications spéciales pour %s"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Connexion"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Autres"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Conférences"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour parcourir les services disponibles"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestion des Services du compte %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Le service n'a pu être trouvé"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3419,51 +3524,69 @@ 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:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Le service ne peut pas être parcouru"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Parcourt %s en utilisant le compte %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Scanne %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Utilisateurs"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "S'inscrire"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Ajouter"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Ajouter"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Fichier"
@@ -3489,7 +3612,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Vous"
 
@@ -3499,7 +3622,7 @@ msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Destinataire : "
 
@@ -3566,31 +3689,31 @@ msgstr "Description : %s"
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Que voulez vous faire ?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3626,12 +3749,11 @@ msgstr "Fichier : "
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Expéditeur : "
 
@@ -3639,31 +3761,31 @@ msgstr "Expéditeur : "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim a besoin d'un serveur X pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim a besoin de GTK 2.6+ pour s'exécuter."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La bibliothèque GTK+ ne contient pas le support de glade"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3672,23 +3794,23 @@ msgstr ""
 "Supprimez votre version actuelle de la bibliothèque GTK+ et installez la "
 "dernière version stable à partir de %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 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
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3696,86 +3818,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorisation HTTP (%s) pour %s (id : %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Connexion"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Sujet : %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "erreur en envoyant %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, 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
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Vous le verrez toujours déconnecté."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s est maintenant %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrect"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nouvel E-mail sur %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3785,57 +3907,62 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos informations de configuration"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Aucune connexion disponible"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
@@ -3859,7 +3986,8 @@ msgid "Shows or hides the roster window"
 msgstr "Montre ou cache la fenêtre principale"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Afficher une fenêtre avec le prochain message non lu"
 
 #: ../src/gajim-remote.py:82
@@ -4190,8 +4318,8 @@ msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Vous n'êtes plus dans le salon \"%s\" ou \"%s\" l'a quitté."
 
 #: ../src/groupchat_control.py:141
@@ -4208,99 +4336,100 @@ msgid "Insert Nickname"
 msgstr "Changer de sur_nom"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s est maintenant %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "Dans le groupe"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s est maintenant %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Surnom introuvable : %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Ce salon n'a pas de sujet"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, 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:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Commandes : %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, 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 "
 "actuellement dans le salon il sera également éjecté. Ne supporte pas les "
 "espaces dans le surnom."
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4308,12 +4437,12 @@ msgstr ""
 "Utilisation : /%s <surnom>, ouvre une fenêtre de discussion privée avec "
 "l'occupant spécifié."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4322,21 +4451,21 @@ msgstr ""
 "Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courrant en "
 "affichant la raison si spécifiée."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Utilisation : /%s <JID> [raison], invite le JID dans le salon actuel, la "
 "raison est optionnelle."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4345,27 +4474,27 @@ msgstr ""
 "Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre "
 "salon@serveur en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 msgstr ""
 "Utilisation : /%s <surnom> [raison], supprime l'occupant portant le surnom "
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_control.py:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. 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.)"
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4374,24 +4503,24 @@ 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."
 
-#: ../src/groupchat_control.py:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr ""
 "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4399,71 +4528,73 @@ msgstr ""
 "Utilisation : /%s <message>, envoie un message sans chercher d'autres "
 "commandes."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Pas d'aide disponible pour /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Si vous fermez cette fenêtre, vous serez déconnecté de ce salon."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Ne plus me poser la question"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Marque-page déjà spécifié"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, 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:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Marque-page ajouté avec succès"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
@@ -4494,67 +4625,67 @@ msgstr "Détails"
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Erreur de lecture du fichier :"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enregistrer le Fichier sous..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Impossible de trouver la base de données de l'historique"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Contacts"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Date"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Pseudonyme"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Message"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Sujet"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4562,7 +4693,7 @@ msgstr ""
 "Voulez vous nettoyer la base de donnée ? (TRÈS DÉCONSEILLÉ SI GAJIM EST "
 "LANCÉ)"
 
-#: ../src/history_manager.py:184
+#: ../src/history_manager.py:188
 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 "
@@ -4576,26 +4707,26 @@ msgstr ""
 "\n"
 "Si vous choisissez OUI, patientez..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Exporte l'historique..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, 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:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "C'est une opération irréversible."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 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é ?"
@@ -4626,11 +4757,11 @@ msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4670,46 +4801,46 @@ msgstr "%(nickname)s : %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nouveau Message de %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Impossible de charger l'image"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Invitation reçue"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4717,88 +4848,89 @@ msgstr ""
 "Une erreur s'est produite lors de la publication de vos informations "
 "personnelles, veuillez réessayer plus tard."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observateurs"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 "Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
 "invisible."
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "en utilisant le compte %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "en utilisant le compte %s"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "du compte %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Gérer les Marque-pages..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, 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
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Vous avez des messages non-lus"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, 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:1262
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4806,12 +4938,12 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4820,72 +4952,121 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Contacts"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Entrez votre mot de passe GPG pour le compte %s."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Renommer"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Entrez votre mot de passe GPG pour le compte %s."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Supprimer"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Enlever le contact de la liste"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez une clé à assigner au contact"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Nouveau Salon"
+msgid "_New group chat"
+msgstr "Salon de Discussion"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "_Envoyer un message au serveur"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Re_nommer"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+msgid "To all online users"
+msgstr ""
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Connecter"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Déconnecter"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, 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:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4893,7 +5074,7 @@ msgstr ""
 "En supprimant ce contact, vous enlevez aussi son autorisation. Il/Elle vous "
 "verra donc toujours déconnecté."
 
-#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4901,17 +5082,17 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il vous "
 "verra donc toujours déconnecté."
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Autoriser ce contact à connaître mon état après la suppression"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, 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
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4920,32 +5101,32 @@ msgstr ""
 "En supprimant ce contact, vous enlevez aussi son autorisation. Il/Elle vous "
 "verra donc toujours déconnecté."
 
-#: ../src/roster_window.py:2411
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, 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:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "mot de passe erroné"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Ressaisissez votre mot de passe GPG ou pressez Annuler."
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4953,21 +5134,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:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4975,111 +5156,135 @@ msgstr ""
 "Les messages seront disponibles à une lecture ultérieure si l'archivage de "
 "l'historique est actif."
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Vous devez créer un compte avant de pouvoir discuter avec d'autres contacts."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Mettre %s dans le groupe %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "associer %s et %s en un contact groupé ?"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Changer le message d'état..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Fonction : "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Cacher ce menu"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Affiliation : "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Identifiant Jabber :"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Ressource : "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP : "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "État : "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Dernière connexion le %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "depuis %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Identifiant Jabber :"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Inscription : "
+
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Télécharger"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Type : "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Non commencé"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Terminé"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Calé"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "En train de transférer"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 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:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5087,32 +5292,32 @@ msgstr ""
 "Ce service n'a pas renvoyé d'informations détaillées.\n"
 "Il est probablement défectueux ou cassé"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "depuis %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Affiliation : "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 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:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5120,12 +5325,12 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
 "votre"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5133,123 +5338,123 @@ msgstr ""
 "Vous n'êtes pas intéressé par l'état de ce contact et il ne s'intéressepas "
 "au votre"
 
-#: ../src/vcard.py:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "création de la base de donnée de l'historique"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s est un fichier mais devrait être un répertoire"
 
-#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim va maintenant s'arrêter"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s est un répertoire mais devrait être un fichier"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "crée le répertoire %s"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, 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:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Absent car inactif"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Non disponible car inactif"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 "Traiter les paires de * / _ comme des éventuels caractères de formatage."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5257,12 +5462,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:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5270,13 +5475,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:145
+#: ../src/common/config.py:147
 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:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5285,7 +5490,7 @@ 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:151
+#: ../src/common/config.py:153
 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-"
@@ -5293,32 +5498,53 @@ msgstr ""
 
 #: ../src/common/config.py:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 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:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Toujours demander avant de fermer les salons de cette liste séparés par des "
 "espaces."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Ne jamais demander avant de fermer les salons de cette liste séparés par des "
 "espaces."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5326,32 +5552,36 @@ 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:162
+#: ../src/common/config.py:166
 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:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, 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:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Afficher le bouton fermer sur l'onglet ?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Une liste de mots séparés par des points-virgules qui seront mis en "
 "surbrillance dans les salons."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5360,11 +5590,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:187
+#: ../src/common/config.py:191
 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:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5372,7 +5602,7 @@ msgstr ""
 "Si vrai, Gajim affichera dans chaque onglet une icône contenant les messages "
 "non-lus. En fonction du thème, cette icône peut être animée."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5381,7 +5611,7 @@ msgstr ""
 "Si vrai, Gajim affichera le message d'état, s'il n'est pas vide, sous le nom "
 "de chaque contact dans la fenêtre principale."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5389,7 +5619,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:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5398,29 +5628,37 @@ 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:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5430,18 +5668,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:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5460,70 +5699,85 @@ msgstr ""
 "'pertype' - Toutes les conversassions d'un même type (discussion, salon) "
 "dans la même fenêtre."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 #, 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:206
+#: ../src/common/config.py:212
 #, 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:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Cacher les boutons dans la fenêtre des salons"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "Cache les boutons dans les fenêtres de discussions"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Cacher les boutons dans la fenêtre de discussion"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Cache la bannière dans les fenêtres de discussions"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat 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:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Contournement de bug de jabberd2"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5531,151 +5785,148 @@ 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:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Dors"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Travail"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Je suis dehors à profiter de la vie"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponible"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Disponible pour discuter"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Non disponible"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 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: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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "Vert"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "épicerie"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "Humain"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "Marine"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "mot de passe erroné"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5688,49 +5939,54 @@ msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:1449
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "Un mot de passe est requis pour rejoindre ce salon."
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Vous n'êtes pas dans la liste des membres."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5739,27 +5995,27 @@ msgstr ""
 "par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, 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
+#: ../src/common/connection_handlers.py:1846
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5769,90 +6025,87 @@ msgstr ""
 "de contact. Utiliser un outil de gestion de liste de contact tel que http://"
 "jru.jabberstudio.org/ pour le supprimer"
 
-#: ../src/common/connection.py:162
-#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"Pour continuer à envoyer et recevoir des messages, vous devez vous "
-"reconnecter."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Le transport %s a mal répondu a la requête "
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Réponse non valide"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Connecté au serveur %s:%s avec %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "Mot de passe OpenPGP non renseigné"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "invisible"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "Déconnecté"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, 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
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[ce message est chiffré]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5861,17 +6114,17 @@ msgstr ""
 "Sujet : %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 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
+#: ../src/common/dbus_support.py:33
 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
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Les possibilités D-Bus de Gajim ne peuvent pas être utilisées"
 
@@ -6059,242 +6312,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Caractère non valide dans le nom d'utilisateur."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Adresse du serveur requise."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Caractère non valide dans le nom d'hôte."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Caractère non valide dans la ressource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s Go"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mo"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s Kio"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "O_ccupé"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Disponible"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Disponible"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Connexion"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "_Absent"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "Déc_onnecté"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "Inconnu"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "en erreur"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "À"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Les deux"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "Aucun"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Modérateurs"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Visiteurs"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Aucun"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "Pr_opriétaire"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrateur"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Membre"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6305,50 +6558,117 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "erreur: impossible d'ouvrir %s en lecture"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "création de la base de donnée de l'historique"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "du compte %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "La connexion avec le contact ne peut être établie."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+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/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, 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
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[ce message est chiffré]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Ajouter"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "erreur en envoyant %s ( %s )"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Nouveau Salon"
+
+#~ msgid "Role: "
+#~ msgstr "Fonction : "
+
+#~ msgid "Affiliation: "
+#~ msgstr "Affiliation : "
+
+#~ 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 ""
+#~ "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)"
 
 #~ msgid "Add"
 #~ msgstr "Ajouter"
@@ -6370,10 +6690,6 @@ msgstr "[ce message est chiffré]"
 #~ msgid "Up"
 #~ msgstr "Haut"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Supprimer"
-
 #~ msgid "Contact _Info"
 #~ msgstr "_Informations"
 
@@ -6404,9 +6720,6 @@ msgstr "[ce message est chiffré]"
 #~ 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"
diff --git a/po/hr.po b/po/hr.po
index 64bd5fc68..d8cd86dc2 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,28 +6,29 @@
 # Armando V. <synan@rilinux.hr> 2006.
 # Vedran M. <rivanvx@gmail.com> 2006.
 #
+#: ../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-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-08-12 21:05+0100\n"
 "Last-Translator: Adrian C. <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\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?0:1);\n"
 
-#: ../gajim.desktop.in.h:1
+#: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber klijent"
 
-#: ../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 Klijent"
 
@@ -44,16 +45,27 @@ msgid "_Discover Services..."
 msgstr "_Otkrivanje Usluga..."
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../data/glade/roster_window.glade.h:15
-#: ../data/glade/systray_context_menu.glade.h:5
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Grupni Razgovor"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Izmjeni Račun..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
+#, fuzzy
+msgid "_Open Gmail Inbox"
+msgstr "_Otvori Sastavljanje Emaila"
+
+#: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
 
@@ -77,7 +89,9 @@ msgstr "<b>Molimo popunite podatke za vaš novi korisnički račun</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Kliknite da vidite mogućnosti (kao što su MSN, ICQ transporti od jabber servera"
+msgstr ""
+"Kliknite da vidite mogućnosti (kao što su MSN, ICQ transporti od jabber "
+"servera"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "Connect when I press Finish"
@@ -106,7 +120,7 @@ msgid "Pass_word:"
 msgstr "Lo_zinka:"
 
 #: ../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 "Snimi lo_zinku"
 
@@ -131,7 +145,7 @@ msgid "Your JID:"
 msgstr "Vaš 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 "_Napredno"
 
@@ -145,7 +159,7 @@ msgid "_Host:"
 msgstr "_Poslužitelj:"
 
 #: ../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 "_Lozinka:"
 
@@ -177,10 +191,12 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Ostalo</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>Osobne informacije</b>"
 
@@ -197,6 +213,7 @@ msgid "Autoreconnect when connection is lost"
 msgstr "Automatsko ponovno spajanje kada je veza izgubljena"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Sp_oji se prilikom pokretanja Gajima"
 
@@ -205,10 +222,19 @@ msgid "Chan_ge Password"
 msgstr "P_romijeni Lozinku"
 
 #: ../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 "Označite ovo kako bi se Gajim spajao na port 5223 gdje se od starijih poslužitelja očekuju SSL mogućnosti. Primjetite da Gajim koristi TLS enkripciju ukoliko to server podržava, te će sa ovom opcijom uključenom TLS biti onemogućen"
+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 ""
+"Označite ovo kako bi se Gajim spajao na port 5223 gdje se od starijih "
+"poslužitelja očekuju SSL mogućnosti. Primjetite da Gajim koristi TLS "
+"enkripciju ukoliko to server podržava, te će sa ovom opcijom uključenom TLS "
+"biti onemogućen"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Odaberi _Ključ"
 
@@ -225,20 +251,18 @@ msgid "Edit Personal Information..."
 msgstr "Izmjeni Osobne Informacije"
 
 #: ../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:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../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:49
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Općenito"
 
@@ -247,24 +271,48 @@ msgid "Hostname: "
 msgstr "Ime poslužitelja:"
 
 #: ../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 "Ako je označeno, Gajim će odašiljati još neke IP adrese osim vaše, kako bi prijenosi datoteka imali veću šansu uspjeha."
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Ako je označeno, Gajim će odašiljati još neke IP adrese osim vaše, kako bi "
+"prijenosi datoteka imali veću šansu uspjeha."
 
 #: ../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 "Ako je označeno, Gajim će slati keep-alive pakete kako bi spriječio prekid veze zbog preduge neaktivnosti"
+msgid ""
+"If checked, Gajim will send keep-alive packets so it prevents connection "
+"timeout which results in disconnection"
+msgstr ""
+"Ako je označeno, Gajim će slati keep-alive pakete kako bi spriječio prekid "
+"veze zbog preduge neaktivnosti"
 
 #: ../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 "Ako je označeno, Gajim će spremiti lozinku u ~/.gajim/config sa 'čitaj' dozvolom samo za vas"
+#: ../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 ""
+"Ako je označeno, Gajim će spremiti lozinku u ~/.gajim/config sa 'čitaj' "
+"dozvolom samo za vas"
 
 #: ../data/glade/account_modification_window.glade.h:21
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Ako je označeno, Gajim će se pri pokretanju automatski spojiti na jabber koristeći ovaj račun"
+#: ../data/glade/zeroconf_properties_window.glade.h:9
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Ako je označeno, Gajim će se pri pokretanju automatski spojiti na jabber "
+"koristeći ovaj račun"
 
 #: ../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 "Ako je označeno, svaka promjena globalnog statusa (koji se mjenja padajućim izbornikom na dnu prozora kontaktne liste) promjenit će status i ovog računa"
+#: ../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 ""
+"Ako je označeno, svaka promjena globalnog statusa (koji se mjenja padajućim "
+"izbornikom na dnu prozora kontaktne liste) promjenit će status i ovog računa"
 
 #: ../data/glade/account_modification_window.glade.h:23
 msgid "Information about you, as stored in the server"
@@ -275,22 +323,22 @@ msgid "Manage..."
 msgstr "Podesi..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../src/config.py:1448
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 msgid "No key selected"
 msgstr "Niti jedan ključ nije odabran"
 
 #. 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:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ništa"
 
 #: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Osobne Informacije"
 
@@ -303,55 +351,80 @@ msgid "Priori_ty:"
 msgstr "Priori_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 "Prioritet se u Jabberu koristi kako bi se odredilo tko dobiva događaje sa jabber servera kada su spojena 2 ili više klijenta koristeći isti račun; klijent sa najvišim prioritetom dobiva te događaje"
+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 ""
+"Prioritet se u Jabberu koristi kako bi se odredilo tko dobiva događaje sa "
+"jabber servera kada su spojena 2 ili više klijenta koristeći isti račun; "
+"klijent sa najvišim prioritetom dobiva te događaje"
 
 #: ../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
-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 "Resurs se šalje Jabber serveru kako bi se razlikovao isti JID kod 2 ili više klijenata spojena u isto vrijeme na isti server sa istim računom. Dakle, možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa najvišim prioritetom dobivat će obavijesti o događajima"
-
 #: ../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 ""
+"Resurs se šalje Jabber serveru kako bi se razlikovao isti JID kod 2 ili više "
+"klijenata spojena u isto vrijeme na isti server sa istim računom. Dakle, "
+"možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa najvišim "
+"prioritetom dobivat će obavijesti o događajima"
+
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Snimi _lozinku (nesigurno)"
 
-#: ../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 "Snimi _dnevnik razgovora za sve kontakte"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
 msgid "Send keep-alive packets"
 msgstr "Šalji 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 "Sink_roniziraj status računa sa globalnim statusom"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
 msgid "Use _SSL (legacy)"
 msgstr "Koristi _SSL (zastarjelo)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
 msgid "Use custom hostname/port"
 msgstr "Koristi vlastito ime poslužitelja/port"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
 msgid "Use file transfer proxies"
 msgstr "Koristi proxy za prijenos datoteka"
 
-#: ../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 "_Ime:"
 
@@ -360,55 +433,89 @@ msgid "Accounts"
 msgstr "Korisnički Račun"
 
 #: ../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 "Ako imate 2 ili više računa i ovo je označeno, Gajim će prikazivati sve kontakte kao da imate jedan račun"
+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 ""
+"Ako imate 2 ili više računa i ovo je označeno, Gajim će prikazivati sve "
+"kontakte kao da imate jedan račun"
+
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Mer_ge accounts"
 msgstr "_Spoji račune"
 
-#: ../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 "_Izmjeni"
 
-#: ../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 "_Ukloni"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
+#, fuzzy
+msgid "A_ccount:"
+msgstr "_Korisnički račun"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
 msgid "A_llow this contact to view my status"
 msgstr "D_ozvoli njemu/njoj da vidi moj 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 Novi 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 "Želio bih Vas dodati na moju listu kontakata."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-msgid "_Account:"
-msgstr "_Korisnički račun"
-
 #: ../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 "_Nadimak:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 msgid "_Protocol:"
 msgstr "_Protokol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_Pretplatiti se"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "Re_gistracija"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 msgid "_User ID:"
 msgstr "_ID Korisnika:"
 
@@ -418,7 +525,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>NAPOMENA:</b> Trebali biste ponovno pokrenuti gajim da bi neke postavke postale aktivne"
+msgstr ""
+"<b>NAPOMENA:</b> Trebali biste ponovno pokrenuti gajim da bi neke postavke "
+"postale aktivne"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -494,71 +603,63 @@ msgid "<b>Sounds</b>"
 msgstr "<b>Zvukovi</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 "Napredne Akcije"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 msgid "Advanced Notifications Control"
 msgstr "Editor Naprednih Obavijesti"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-msgid "All Status "
+#: ../data/glade/advanced_notifications_window.glade.h:7
+#, fuzzy
+msgid "All statuses"
 msgstr "Svi Statusi: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr "I ja "
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:234
+msgid "Away"
 msgstr "Odsutan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 msgid "Busy "
 msgstr "Zaposlen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr "Nemam "
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-msgid "Down"
-msgstr "Skidanje"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr "Imam "
 
-#: ../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:244
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 msgid "Launch a command"
 msgstr "Pokrenite naredbu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-msgid "List of special notifications settings"
-msgstr "Lista podešenja posebnih obavijesti"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:217
+msgid "Not Available"
 msgstr "Nedostupan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
+#, fuzzy
+msgid "One or more special statuses..."
+msgstr "Neki poseban status..."
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 msgid "Online / Free For Chat"
 msgstr "Spojen / Slobodan za Razgovor"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid "Play a sound"
 msgstr "Sviraj zvukove"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -580,59 +681,59 @@ msgstr ""
 "Početak Prijenosa Datoteke\n"
 "Završen Prijenos Datoteke"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
-msgid "Some special(s) status..."
-msgstr "Neki poseban status..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr "Gore"
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr "Kada "
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
-msgstr "_Aktivacija opcije Upravitelja prozorima za bljeskanje razgovora u taskbaru"
+#: ../data/glade/advanced_notifications_window.glade.h:28
+#, fuzzy
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Aktivacija opcije Upravitelja prozorima za bljeskanje razgovora u taskbaru"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable auto opening chat window"
 msgstr "_Onemogući automatsko otvaranje prozora razgovora"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr "_Onemogući postojeći iskočni prozor"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr "_Onemogući postojeći zvuk za ovaj događaj"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr "_Onemogući prikazivanje događaja u listi kontakata"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr "_Onemogući prikazivanje događaja u systrayu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr "_Obavijesti me sa iskočnim prozorom"
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Open chat window with user"
 msgstr "_Otvori prozor za razgovor sa korisnikom"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in roster"
 msgstr "Prikaži događaj u _listi kontakata"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "_Show event in systray"
 msgstr "Prikaži samo u _listi kontakata"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+#, fuzzy
+msgid "and I "
+msgstr "I ja "
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
@@ -642,12 +743,13 @@ msgstr ""
 "grupe\n"
 "svi"
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "for "
 msgstr "za"
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
-msgid "when I'm "
+#: ../data/glade/advanced_notifications_window.glade.h:43
+#, fuzzy
+msgid "when I'm in"
 msgstr "kada sam "
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -681,7 +783,7 @@ msgstr "Pridruživanje _Grupnom Razgovoru"
 #: ../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:10
 msgid "_Add to Roster"
 msgstr "_Dodaj na Listu"
 
@@ -702,8 +804,9 @@ msgid "_Open Link in Browser"
 msgstr "_Otvori Link u Pretražniku"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:19
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Započni Razgovor"
 
@@ -712,7 +815,8 @@ msgid "Click to see past conversations with this contact"
 msgstr "Pritisnite za pregled prošlih razgovora sa ovim 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:8
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Pošalji _Datoteku"
 
@@ -728,11 +832,17 @@ msgstr "_Kompaktan Pregled    Alt+K"
 #: ../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:13
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Povijest"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "sve u grupi"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Konfiguracija Sobe"
 
@@ -774,22 +884,26 @@ msgstr "Ukloni prijenos datoteka sa liste"
 
 #: ../data/glade/filetransfers.glade.h:9
 msgid "Removes completed, canceled and failed file transfers from the list"
-msgstr "Ukloni završene, zaustavljene ili neuspjele prijenose datoteka sa liste"
+msgstr ""
+"Ukloni završene, zaustavljene ili neuspjele prijenose datoteka sa liste"
 
 #: ../data/glade/filetransfers.glade.h:10
 msgid "Shows a list of file transfers between you and other"
 msgstr "Prikazuje listu prijenosa datoteka između vas i ostalih"
 
 #: ../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 "Ova akcija uklanja prijenos datoteke sa liste. Ako je prijenos aktivan, prvo se zaustavlja i onda uklanja"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Ova akcija uklanja prijenos datoteke sa liste. Ako je prijenos aktivan, prvo "
+"se zaustavlja i onda uklanja"
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Pokaži popup obavijest kada se završi prijenos datoteka"
 
-#: ../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 "_Nastaviti"
 
@@ -797,8 +911,7 @@ msgstr "_Nastaviti"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Obavijesti me kada se završi prijenos datoteka"
 
-#: ../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 "_Otvaranje Mape Sadržaja"
 
@@ -815,11 +928,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Boje Tabova Statusa Razgovora</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Korisnički račun\n"
 "Grupa\n"
@@ -827,40 +941,34 @@ msgstr ""
 "Baner"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4
-#: ../src/config.py:326
-msgid "Active"
-msgstr "Aktivno"
-
-#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Bold"
 msgstr "Podebljano"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/glade/gajim_themes_window.glade.h:7
 msgid "Composing"
 msgstr "Pisanje"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/glade/gajim_themes_window.glade.h:8
 msgid "Font style:"
 msgstr "Stil fonta:"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
 msgstr "Personalizacija Gajim Tema"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Otišao"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:11
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/glade/gajim_themes_window.glade.h:12
 msgid "Italic"
 msgstr "Ukošeno"
 
-#: ../data/glade/gajim_themes_window.glade.h:14
+#: ../data/glade/gajim_themes_window.glade.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -868,7 +976,7 @@ msgstr ""
 "MUC\n"
 "Poruke"
 
-#: ../data/glade/gajim_themes_window.glade.h:16
+#: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -876,20 +984,19 @@ msgstr ""
 "MUC Usmjerene\n"
 "Poruke"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
-#: ../src/tooltips.py:667
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Pauza"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "Boj_a teksta:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
 msgstr "_Font Teksta:"
 
-#: ../data/glade/gajim_themes_window.glade.h:21
+#: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
 msgstr "_Pozadina:"
 
@@ -956,14 +1063,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>Dobro došli u Gajim Upravitelj Zabilješkama Povijesti</b></big>\n"
 "\n"
-"Sa lijeve strane možete odabrati zabilješke i/ili niže pretražiti bazu podataka.\n"
+"Sa lijeve strane možete odabrati zabilješke i/ili niže pretražiti bazu "
+"podataka.\n"
 "\n"
 "<b>UPOZORENJE:</b>\n"
-"Ako planirate raditi veća uklanjanja, osigurajte da Gajim nije pokrenut. Općenito izbjegavajte uklanjanja vezana uz kontakte sa kojima trenutno razgovarate."
+"Ako planirate raditi veća uklanjanja, osigurajte da Gajim nije pokrenut. "
+"Općenito izbjegavajte uklanjanja vezana uz kontakte sa kojima trenutno "
+"razgovarate."
 
 #: ../data/glade/history_manager.glade.h:7
 msgid "Delete"
@@ -1006,7 +1117,7 @@ msgid "Accept"
 msgstr "Prihvati"
 
 #: ../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 "Odbij"
 
@@ -1014,13 +1125,13 @@ msgstr "Odbij"
 msgid "Invitation Received"
 msgstr "Primljen Poziv"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 msgid "Join Group Chat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/glade/profile_window.glade.h:23
 #: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Nadimak:"
@@ -1039,14 +1150,8 @@ msgstr "Nedavno:"
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:8
-msgid "Server:"
-msgstr "Poslužitelj:"
-
-#: ../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:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Pridruživanje"
 
@@ -1060,7 +1165,8 @@ msgstr "Automatsko spajanje"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:2
 msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
+msgstr ""
+"Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:3
 msgid "Manage Bookmarks"
@@ -1070,6 +1176,10 @@ msgstr "Podešavanje Knjižnih Oznaka"
 msgid "Print status:"
 msgstr "Ispis statusa:"
 
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
+msgstr "Poslužitelj:"
+
 #: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Title:"
 msgstr "Naslov:"
@@ -1091,6 +1201,7 @@ msgid "Manage Proxy Profiles"
 msgstr "Podešavanje Proxy Profila"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/profile_window.glade.h:22
 #: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Ime:"
@@ -1107,21 +1218,21 @@ msgstr "Koristi autentifikaciju"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Kliknite da ubacite 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:1099
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Enkripcija"
 
 #. 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:6
 msgid "_Actions"
 msgstr "_Akcije"
 
 #. 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 "_Pošalji"
 
@@ -1186,29 +1297,39 @@ msgstr "Dozvoli slanje podataka o _OS-u"
 
 #: ../data/glade/preferences_window.glade.h:18
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Dozvoli popup obavijesti kada sam _odsutan/nedostupan/zaposlen/nevidljiv"
+msgstr ""
+"Dozvoli popup obavijesti kada sam _odsutan/nedostupan/zaposlen/nevidljiv"
 
 #: ../data/glade/preferences_window.glade.h:19
 msgid "Also known as iChat style"
 msgstr "Poznato i kao 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 "Traži poruku statusa kada ja:"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:22
 msgid "Auto _away after:"
 msgstr "Automatski _odsutan nakon:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Auto _not available after:"
 msgstr "Automatski _nedostupan nakon:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Automatski prepoznaj na svakom Gajim pokretanju\n"
@@ -1216,100 +1337,179 @@ msgstr ""
 "Uvijek koristi predefiniranu KDE aplikaciju\n"
 "Prilagođeno"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "Prij_e nadimka"
 
-#: ../data/glade/preferences_window.glade.h:28
-#: ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Razgovor"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "Chat state noti_fications:"
-msgstr "Noti_fikacije o statusu razgovora"
+#: ../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 ""
+"Označite ovu opciju samo ako vas netko van vaše liste spama/uznemirava. "
+"Koristite sa oprezom, blokira sve poruke koje dolaze od ljudi van vaše liste "
+"kontakata"
 
-#: ../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 "Označite ovu opciju samo ako vas netko van vaše liste spama/uznemirava. Koristite sa oprezom, blokira sve poruke koje dolaze od ljudi van vaše liste kontakata"
+#: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:33
+#, fuzzy
+msgid "Default Status Messages"
+msgstr "Statusna Poruka"
+
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "Predefinirani statusni set _ikona"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr "Prikaži dodatne email _detalje"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Prikaži a_vatare kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Prikaži statusne _poruke kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Noti_fikacije o statusu razgovora"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "S_vakih 5 minuta"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Emotikone:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Događaji"
 
-#: ../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 primati i slati meta-informacije vezane za razgovor koji vodite sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se slati drugoj osobi."
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Gajim will automatically show new events by poping up the relative window"
-msgstr "Gajim će automatski prikazivati nove događaje iskačući sa bitnim prozorom"
-
-#: ../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 će vas obavijestiti o novim događajima sa popup prozorom u donjem desnom kutu ekrana"
-
-#: ../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 će vas obavijestiti o kontaktima koji su se upravo prijavili sa popup prozorom u donjem desnom kutu ekrana"
-
 #: ../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 će vas obavijestiti o kontaktima koji su se upravo odjavili sa popup prozorom u donjem desnom kutu ekrana"
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim može primati i slati meta-informacije vezane za razgovor koji vodite "
+"sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se slati "
+"drugoj osobi."
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim će mjenjati ikonu samo onom kontaktu koji je potaknuo novi događaj"
+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 primati i slati meta-informacije vezane za razgovor koji vodite "
+"sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se slati "
+"drugoj osobi."
+
+#: ../data/glade/preferences_window.glade.h:44
+msgid ""
+"Gajim will automatically show new events by poping up the relative window"
+msgstr ""
+"Gajim će automatski prikazivati nove događaje iskačući sa bitnim prozorom"
 
 #: ../data/glade/preferences_window.glade.h:45
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i u grupnim razgovorima"
+msgid ""
+"Gajim will notify you for new events via a popup in the bottom right of the "
+"screen"
+msgstr ""
+"Gajim će vas obavijestiti o novim događajima sa popup prozorom u donjem "
+"desnom kutu ekrana"
 
 #: ../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 "Ako je označeno, Gajim će prikazivati statusne poruke kontakata ispod imena kontakta u listi kontakata i u grupnim razgovorima"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed in"
+msgstr ""
+"Gajim će vas obavijestiti o kontaktima koji su se upravo prijavili sa popup "
+"prozorom u donjem desnom kutu ekrana"
 
 #: ../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 "Ako je označeno, Gajim će se prisjetiti pozicije prozora liste kontakata i razgovora, kao i njihove veličine kod sljedećeg pokretanja"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim će vas obavijestiti o kontaktima koji su se upravo odjavili sa popup "
+"prozorom u donjem desnom kutu ekrana"
 
 #: ../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 "Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. (npr. kontakt sa MSN-a će imati msn ikone za statuse)"
-
-#: ../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 "Ako nije onemogućeno, Gajim će zamjeniti ascii smajliće poput ':)' sa ekvivalentnim animiranim ili statičnim grafičkim emotikonama"
+msgid ""
+"Gajim will only change the icon of the contact that triggered the new event"
+msgstr ""
+"Gajim će mjenjati ikonu samo onom kontaktu koji je potaknuo novi događaj"
 
 #: ../data/glade/preferences_window.glade.h:50
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:51
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
+"u grupnim razgovorima"
+
+#: ../data/glade/preferences_window.glade.h:52
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Ako je označeno, Gajim će prikazivati statusne poruke kontakata ispod imena "
+"kontakta u listi kontakata i u grupnim razgovorima"
+
+#: ../data/glade/preferences_window.glade.h:53
+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 ""
+"Ako je označeno, Gajim će se prisjetiti pozicije prozora liste kontakata i "
+"razgovora, kao i njihove veličine kod sljedećeg pokretanja"
+
+#: ../data/glade/preferences_window.glade.h:54
+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 ""
+"Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
+"(npr. kontakt sa MSN-a će imati msn ikone za statuse)"
+
+#: ../data/glade/preferences_window.glade.h:55
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Ako nije onemogućeno, Gajim će zamjeniti ascii smajliće poput ':)' sa "
+"ekvivalentnim animiranim ili statičnim grafičkim emotikonama"
+
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "Po_desi"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1321,221 +1521,258 @@ msgstr ""
 "Ovisi o računu\n"
 "Ovisi o tipu"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Obavijesti me o kontaktima koji:"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Notify on new _GMail email"
 msgstr "Obavijesti o novoj _Gmail e-pošti"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "Na svaku _poruku"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "Prozor _jedne poruke:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Noti_fikacije o statusu razgovora"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Sviraj _zvukove"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Prikaz vremena:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Save _position and size for roster and chat windows"
 msgstr "Snimi _poziciju i veličinu za prozore liste kontakata i razgovora"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:71
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Prikaži samo u _listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "Prijavi _se"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "_Odjavi se"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Statusna poruka automatske odsutnosti"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Statusna poruka automatske ne dostupnosti"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Koristi set ikona _transporta"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr "Koristi pret_postavljeno od sustava"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Koristi t_ray ikonu"
 
-#: ../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 "Kada se primi novi događaj (poruka, zahtjev za prijenosom datoteka i sl.), mogu se koristiti sjedeće metode za obavijest. Imajte na umu da se obavijesti o novim porukama prikazuju samo za kontakte sa kojima trenutno ne razgovarate"
+#: ../data/glade/preferences_window.glade.h:83
+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 ""
+"Kada se primi novi događaj (poruka, zahtjev za prijenosom datoteka i sl.), "
+"mogu se koristiti sjedeće metode za obavijest. Imajte na umu da se "
+"obavijesti o novim porukama prikazuju samo za kontakte sa kojima trenutno ne "
+"razgovarate"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Kada se primi novi događaj"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Advanced Notifications Control..."
 msgstr "_Napredno Upravljanje Obavijestima..."
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_Nakon vremena:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "_Prije vremena:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Pretražnik:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Upravitelj datotekama:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Font:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Osvijetli krivo napisane riječi"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoriraj događaje od kontakata koji nisu na listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "_Dolazna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Pamti promjene statusa kontakata"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Mail klijent:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Nikada"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Obavijesti me o tome"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "_Odlazna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Player:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Iskoči ga"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "_Ponovo učitavanje Pretpostavljenih Boja"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "_Sortiranje kontakata po statusu"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "_Statusna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minuta"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:1
+#: ../data/glade/privacy_lists_window.glade.h:1
+#, fuzzy
+msgid "Privacy Lists:"
+msgstr "Liste Privatnosti"
+
+#: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Dodaj / Izmjeni pravilo</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 pravila</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>Lista Privatnosti</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 "Sp_oji se prilikom pokretanja Gajima"
+
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr "Svi"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
+#: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
 msgstr "Dozvoli"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:7
-msgid "Default"
-msgstr "Predefinirano"
-
-#: ../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 "Poredak:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11
-#: ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr "Lista Privatnosti"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:12
 msgid "all by subscription"
 msgstr "sve prema pretplati"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all in the group"
 msgstr "sve u grupi"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
 "both\n"
@@ -1547,29 +1784,169 @@ msgstr ""
 "od\n"
 "za"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:18
 msgid "to send me messages"
 msgstr "da mi šalje poruke"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
 msgstr "da mi šalje upite"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me status"
 msgstr "da mi prikaže status"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to view my status"
 msgstr "da vidi moj status"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:1
-msgid "Create your own Privacy Lists"
-msgstr "Sami stvorite svoju vlasitu Listu Privatnosti"
+#. "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"
+
+#: ../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 "Postavi _Avatar"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Rođendan:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Mjesto:"
+
+#: ../data/glade/profile_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:10
+msgid "Company:"
+msgstr "Poduzeće:"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "Country:"
+msgstr "Država:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:13
+msgid "Department:"
+msgstr "Odjel:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:14
+#: ../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:15
+msgid "Extra Address:"
+msgstr "Dodatna Adresa:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:17
+msgid "Family:"
+msgstr "Obitelj:"
+
+#. 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:19
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: GGGG-MM-DD"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Given:"
+msgstr "Dano:"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:22
+msgid "Homepage:"
+msgstr "Vlastita stranica:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "Middle:"
+msgstr "Srednje"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:26
+msgid "More"
+msgstr "Više"
+
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "Personal Info"
+msgstr "Osobne Informacije"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Phone No.:"
+msgstr "Broj Telefona:"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Position:"
+msgstr "Pozicija:"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:33
+msgid "Postal Code:"
+msgstr "Poštanski broj:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:35
+msgid "Prefix:"
+msgstr "Prefiks:"
+
+#: ../data/glade/profile_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
+msgid "Role:"
+msgstr "Uloga:"
+
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:38
+msgid "State:"
+msgstr "Država:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:40
+msgid "Street:"
+msgstr "Ulica:"
 
-#: ../data/glade/privacy_lists_first_window.glade.h:2
-msgid "Server-based Privacy Lists"
-msgstr "Liste Privatnosti ovisne o poslužitelju"
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Suffix:"
+msgstr "Sufiks:"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Work"
+msgstr "Posao"
+
+#: ../data/glade/profile_window.glade.h:36
+msgid "_Publish"
+msgstr "_Objava"
+
+#: ../data/glade/profile_window.glade.h:37
+msgid "_Retrieve"
+msgstr "_Dohvati"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
@@ -1588,45 +1965,63 @@ msgid "A_sk to see his/her status"
 msgstr "Traži njegov/njezin 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 Posebnu _Obavijest"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
 msgid "Assign Open_PGP Key"
 msgstr "Pridruži Open_PGP Ključ"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Izmjeni _Grupe"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Pošalji Jednu _Poruku"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Započni _Razgovor"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "_Allow him/her to see my status"
 msgstr "_Dozvoli njemu/njoj da vidi moj status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabrani mu/joj da vidi moj status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Ukloni sa Liste kontakata"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Preimenuj"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Pretplata"
 
@@ -1651,43 +2046,53 @@ msgid "Help online"
 msgstr "Online Pomoć"
 
 #: ../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 "Prijenosi"
+
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show _Offline Contacts"
 msgstr "Prikaži _Odspojene Kontakte"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Discover Services"
 msgstr "_Otkrivanje Usluga"
 
-#: ../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:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../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 "_Pomoć"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Preferences"
 msgstr "_Postavke"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Quit"
 msgstr "_Izlaz"
 
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_View"
+msgstr "_Glas"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "K_reni"
@@ -1753,12 +2158,13 @@ msgid "_Send & Close"
 msgstr "_Pošalji i Zatvori"
 
 #: ../data/glade/subscription_request_window.glade.h:1
-msgid "Authorize contact so he can know when you're connected"
-msgstr "Dozvoli kontaktu da može vidjeti kada sam spojen"
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Odobri"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Contact _Info"
-msgstr "Kontakt _Info"
+msgid "Authorize contact so he can know when you're connected"
+msgstr "Dozvoli kontaktu da može vidjeti kada sam spojen"
 
 #: ../data/glade/subscription_request_window.glade.h:3
 msgid "Deny authorization from contact so he cannot know when you're connected"
@@ -1768,184 +2174,77 @@ msgstr "Odbija autorizaciju kontaktu kako nebi mogao vidjeti kada ste spojeni"
 msgid "Subscription Request"
 msgstr "Zahtjev za Pretplatom"
 
-#: ../data/glade/subscription_request_window.glade.h:5
-msgid "_Authorize"
-msgstr "_Odobri"
-
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Odbij"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Wav Zvukovi"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Prikaži Sve _Događaje na Čekanju"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Prikaži _Listu Kontakata"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 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 "O"
-
-#: ../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 "Pitaj:"
 
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Birthday:"
-msgstr "Rođendan:"
-
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "City:"
-msgstr "Mjesto:"
-
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/glade/vcard_information_window.glade.h:8
 msgid "Client:"
 msgstr "Klijent:"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Company:"
-msgstr "Poduzeće:"
-
 #: ../data/glade/vcard_information_window.glade.h:9
-msgid "Contact Information"
-msgstr "Informacije Kontakta"
-
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Country:"
-msgstr "Država:"
+#, fuzzy
+msgid "Comments"
+msgstr "Komentar: %s"
 
 #: ../data/glade/vcard_information_window.glade.h:11
-msgid "Department:"
-msgstr "Odjel:"
-
-#: ../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 "Dodatna Adresa:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Family:"
-msgstr "Obitelj:"
-
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: GGGG-MM-DD"
-
-#. Given Name
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Given:"
-msgstr "Dano:"
-
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Homepage:"
-msgstr "Vlastita stranica:"
-
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Jabber"
-msgstr "Jabber"
+#: ../data/glade/zeroconf_information_window.glade.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakti"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Location"
-msgstr "Lokacija"
-
-#. Middle Name
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Middle:"
-msgstr "Srednje"
-
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "More"
-msgstr "Više"
-
 #: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "Phone No.:"
-msgstr "Broj Telefona:"
-
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Position:"
-msgstr "Pozicija:"
-
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Postal Code:"
-msgstr "Poštanski broj:"
-
-#. 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/vcard_information_window.glade.h:36
+#: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Resurs"
 
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Role:"
-msgstr "Uloga:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Set _Avatar"
-msgstr "Postavi _Avatar"
-
-#: ../data/glade/vcard_information_window.glade.h:38
-msgid "State:"
-msgstr "Država:"
-
 #: ../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:"
-
-#: ../data/glade/vcard_information_window.glade.h:41
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Pretplata:"
 
-#. 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 "Posao"
-
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Pamti povijest razgovora"
 
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "_Publish"
-msgstr "_Objava"
-
-#: ../data/glade/vcard_information_window.glade.h:47
-msgid "_Retrieve"
-msgstr "_Dohvati"
-
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Promet</b>"
@@ -1977,328 +2276,512 @@ msgstr "_Poruka"
 msgid "_Presence"
 msgstr "_Prisutnost"
 
-#: ../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 "Ime:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Ime:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr ""
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+#, fuzzy
+msgid "Personal"
+msgstr "Osobni detalji"
+
+#: ../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 "_Izmjeni Račun..."
+
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Koristi vlastito ime poslužitelja/port"
+
+#: ../src/advanced.py:57
 msgid "Preference Name"
 msgstr "Ime Postavke"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:63
 msgid "Value"
 msgstr "Vrijednost"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:72
 msgid "Type"
 msgstr "Vrsta"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:128
 msgid "(None)"
 msgstr "(Nema)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:227
 msgid "Hidden"
 msgstr "Skrivena"
 
-#. 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 "Općenito"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Greek"
+msgstr "zelena"
+
+#: ../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 "Lokacija"
+
+#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Italian"
+msgstr "Ukošeno"
+
+#: ../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 "_Objava"
+
+#: ../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:1497
 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 ""
-"Ako to nije vaš jezik za koji želite osvjetliti krivo napisane riječi, molimo podesite $LANG varijablu na odgovarajuću vrijednost. Npr. za francuski napravite export LANG=fr_FR ili export LANG=fr_FR.UTF-8 u ~/.bash_profile ili kako bi bilo globalno u /etc/profile.\n"
+"Ako to nije vaš jezik za koji želite osvjetliti krivo napisane riječi, "
+"molimo podesite $LANG varijablu na odgovarajuću vrijednost. Npr. za "
+"francuski napravite export LANG=fr_FR ili export LANG=fr_FR.UTF-8 u ~/."
+"bash_profile ili kako bi bilo globalno u /etc/profile.\n"
 "\n"
 "Mogućnost osvjetljavanja krivo napisanih riječi neće biti korištena"
 
+#: ../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 "Veza nije dostupna"
 
-#: ../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ša poruka ne može biti poslana dok niste spojeni."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Razgovori"
 
+#: ../src/chat_control.py:1025
+#, python-format
+msgid "%(nickname)s from group chat %(room_name)s"
+msgstr ""
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1113
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s nije ustupio OpenPGP ključ, niti mu je ikoji dodijeljen"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Enkripcija omogućena"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Enkripcija onemogućena"
 
 #. 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:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Nije na Listi Kontakata"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: ../src/chat_control.py:1384
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Ako zatvorite ovaj tab, a imate povijest onemogućenu, ova poruka biti će izgubljena."
+#: ../src/chat_control.py:1531
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Ako zatvorite ovaj tab, a imate povijest onemogućenu, ova poruka biti će "
+"izgubljena."
 
-#: ../src/config.py:120
-#: ../src/config.py:511
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../src/config.py:199
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Svakih %s _minuta"
 
-#: ../src/config.py:334
+#: ../src/config.py:357
+msgid "Active"
+msgstr "Aktivno"
+
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Događaj"
 
-#: ../src/config.py:881
+#: ../src/config.py:678 ../src/gajim.py:2072
+#, fuzzy, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Veza nije dostupna"
+
+#: ../src/config.py:679 ../src/gajim.py:2073
+#, 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:1031
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:881
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
-#: ../src/config.py:916
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Prva Poruka Primljena"
 
-#: ../src/config.py:917
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Sljedeća Poruka Primljena"
 
-#: ../src/config.py:918
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Kontakt Spojen"
 
-#: ../src/config.py:919
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Kontakt Odspojen"
 
-#: ../src/config.py:920
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Poruka Poslana"
 
-#: ../src/config.py:921
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: ../src/config.py:922
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
 
-#: ../src/config.py:1112
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Primljen Poziv"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računalu"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na poslužitelj"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promjenu imena računa morate se odspojiti."
 
-#: ../src/config.py:1158
-#: ../src/config.py:1715
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1159
+#: ../src/config.py:1333
 msgid "To change the account name, you must read all pending events."
-msgstr "Da biste mogli promjeniti ime računa, morate pročitati sve čekajuće događaje"
+msgstr ""
+"Da biste mogli promjeniti ime računa, morate pročitati sve čekajuće događaje"
 
-#: ../src/config.py:1163
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Ime Računa Već Upotrebljeno"
 
-#: ../src/config.py:1164
-msgid "This name is already used by another of your accounts. Please choose another name."
+#: ../src/config.py:1338
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 msgstr "Ovo ime već koristi vaš drugi račun. Molimo odaberite drugo ime."
 
-#: ../src/config.py:1168
-#: ../src/config.py:1172
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Neispravno ime računa"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Ime računa ne može biti prazno."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Ime računa ne može sadržavati razmake."
 
-#: ../src/config.py:1181
-#: ../src/config.py:1187
-#: ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Neispravan Jabber ID"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID mora biti forme \"korisnik@poslužitelj\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/config.py:1376
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Prijaviti se odmah?"
 
-#: ../src/config.py:1377
+#: ../src/config.py:1559
 msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Ako želite da se sve promjene odmah primjene, morate se ponovo prijaviti."
+msgstr ""
+"Ako želite da se sve promjene odmah primjene, morate se ponovo prijaviti."
 
-#: ../src/config.py:1403
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Takav račun nije dostupan"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1586
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napravit svoj račun prije izmjena osobnih informacija."
 
-#: ../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:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Niste spojeni na poslužitelj."
 
-#: ../src/config.py:1411
+#: ../src/config.py:1594
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez veze sa poslužiteljom nije moguća izmjena osobnih informacija."
 
-#: ../src/config.py:1435
+#: ../src/config.py:1598
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1599
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "Morate napravit svoj račun prije izmjena osobnih informacija."
+
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Neuspješno dohvaćanje tajnih ključeva"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Došlo je do problema pri dohvaćanju vaših OpenPGP tajnih ključeva."
 
-#: ../src/config.py:1439
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite svoj OpenPGP ključ"
 
 #. Name column
-#: ../src/config.py:1667
-#: ../src/disco.py:727
-#: ../src/disco.py:1466
-#: ../src/history_window.py:77
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju prije uklanjanja ovog računa."
 
-#: ../src/config.py:1911
+#: ../src/config.py:1962
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "nemate aktivnih računa"
+
+#: ../src/config.py:1963
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:2022
+#, fuzzy
+msgid "Account Local already exists."
+msgstr "Ime Računa Već Upotrebljeno"
+
+#: ../src/config.py:2023
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr ""
+
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Izmjena %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registrirati se na %s"
 
-#: ../src/config.py:1984
+#. list at the begining
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Ban Lista"
 
-#: ../src/config.py:1985
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Lista Članova"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Lista Vasnika"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Lista Administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020
-#: ../src/disco.py:734
-#: ../src/history_manager.py:151
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2028
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Zabranjivanje..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2306,11 +2789,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Dodaja Člana..."
 
-#: ../src/config.py:2063
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2318,11 +2801,11 @@ msgstr ""
 "<b>Koga želite učiniti članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Dodavanje Vlasnika..."
 
-#: ../src/config.py:2066
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2330,11 +2813,11 @@ msgstr ""
 "<b>Koga želite učiniti vlasnikom?</b>\n"
 "\n"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Dodajem Administratora..."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2342,7 +2825,7 @@ msgstr ""
 "<b>Koga želite učiniti administratorom?</b>\n"
 "\n"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2358,289 +2841,319 @@ msgstr ""
 "4. domena (sama domena se poklapa, kao i bilo koji korisnik@domena,\n"
 "domena/resurs, ili adresa koja sadrži poddomenu."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje %s računa"
 
-#: ../src/config.py:2183
-#: ../src/roster_window.py:1857
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/config.py:2184
-#: ../src/roster_window.py:1858
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
 
-#: ../src/config.py:2185
-#: ../src/roster_window.py:1859
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2638
+msgid "Default"
+msgstr "Predefinirano"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Ispis statusa:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr "Ući i samo napustiti"
 
-#: ../src/config.py:2352
-msgid "New Room"
-msgstr "Nova Soba"
+#: ../src/config.py:2709
+#, fuzzy
+msgid "New Group Chat"
+msgstr "Grupni Razgovor"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Ova knjižna oznaka ima neispravne podatke"
 
-#: ../src/config.py:2384
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Molimo obavezno ispunite polja poslužitelja i sobe ili uklonite ovu kljižnu oznaku."
+#: ../src/config.py:2742
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Molimo obavezno ispunite polja poslužitelja i sobe ili uklonite ovu kljižnu "
+"oznaku."
 
-#: ../src/config.py:2638
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:2639
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
 
-#: ../src/config.py:2648
-#: ../src/dialogs.py:1118
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/config.py:2649
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Morate unesti lozinku za novi račun"
 
-#: ../src/config.py:2653
-#: ../src/dialogs.py:1123
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: ../src/config.py:2654
-#: ../src/dialogs.py:1124
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
-#: ../src/config.py:2673
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Dvostruki Jabber ID"
 
-#: ../src/config.py:2674
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Ovaj račun je već konfiguriran u Gajimu."
 
-#: ../src/config.py:2691
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Račun je uspješno dodan"
 
-#: ../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 "Napredne opcije računa možete podesiti pritiskom na gumb Napredno, ili kasnije klikom na element Računi pod izbornikom Uredi iz glavnog prozora."
+#: ../src/config.py:3059 ../src/config.py:3094
+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 ""
+"Napredne opcije računa možete podesiti pritiskom na gumb Napredno, ili "
+"kasnije klikom na element Računi pod izbornikom Uredi iz glavnog prozora."
 
-#: ../src/config.py:2724
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi račun je uspješno stvoren"
 
-#: ../src/config.py:2740
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
 
-#: ../src/config.py:2797
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Ime računa se već koristi"
 
-#: ../src/config.py:2798
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Već imate račun pod tim imenom."
 
-#: ../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 niže od ove linije je ono što je rečeno od kad ste zadnji puta obraćali pozornost na ovaj grupni razovor"
+#: ../src/conversation_textview.py:271
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
+msgstr ""
+"Tekst niže od ove linije je ono što je rečeno od kad ste zadnji puta "
+"obraćali pozornost na ovaj grupni razovor"
 
-#: ../src/conversation_textview.py:263
-#, python-format
-msgid "Actions for \"%s\""
+#: ../src/conversation_textview.py:340
+#, fuzzy, python-format
+msgid "_Actions for \"%s\""
 msgstr "Akcije za \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Wikipedii"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:357
 msgid "Look it up in _Dictionary"
 msgstr "Potražiti u _Riječniku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:373
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL-u riječnika nedostaje \"%s\" i nije WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Web Pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "_Pretraži Web"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:395
+msgid "Open as _Link"
+msgstr ""
+
+#: ../src/conversation_textview.py:752
 msgid "Yesterday"
 msgstr "Jučer"
 
 #. 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:756
 #, python-format
 msgid "%i days ago"
 msgstr "Prije %i dana"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:788
 #, 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 "Ovom računalu nedostaju D-Bus python poveznice"
-
-#: ../src/dbus_support.py:33
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus mogućnosti Gajima ne mogu se koristiti"
-
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:59
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
-#: ../src/dialogs.py:57
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "ID ključa"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna Poruka"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Statusna Poruka"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Snimiti kao Unaprijed Postavljenu Statusnu Poruku"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Molimo unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:417
+#, fuzzy
+msgid "AIM Address:"
+msgstr "_Adresa:"
+
+#: ../src/dialogs.py:418
+msgid "GG Number:"
+msgstr ""
+
+#: ../src/dialogs.py:419
+msgid "ICQ Number:"
+msgstr ""
+
+#: ../src/dialogs.py:420
+#, fuzzy
+msgid "MSN Address:"
+msgstr "_Adresa:"
+
+#: ../src/dialogs.py:421
+#, fuzzy
+msgid "Yahoo! Address:"
+msgstr "Dodatna Adresa:"
+
+#: ../src/dialogs.py:457
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Molimo ispunite podatke kontakta kojeg želite dodati u račun %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:459
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molimo ispunite podatke kontakta kojeg želite dodati"
 
-#: ../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:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Prijenosi"
 
-#: ../src/dialogs.py:493
-#: ../src/dialogs.py:499
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Neispravan Korisnički ID"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne smije sadržavati resurs."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Kontakt je već na listi"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Ovaj kontakt je već na vašoj listi kontakata."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:665
+#, fuzzy
+msgid "User ID:"
+msgstr "_ID Korisnika:"
+
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klijent"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr "GTK+ Verzija:"
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr "PyGTK Verzija:"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:744
 msgid "Current Developers:"
 msgstr "Trenutni Razvojni Programeri:"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Prošli Razvojni Programeri:"
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "ZAHVALE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:762
 msgid "Last but not least, we would like to thank all the package maintainers."
-msgstr "Zadnje, ali ne najmanje, željeli bismo se zahvaliti svim održavateljima paketa"
+msgstr ""
+"Zadnje, ali ne najmanje, željeli bismo se zahvaliti svim održavateljima "
+"paketa"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr ""
 "Adrian C. <anrxc@sysphere.org>\n"
@@ -2648,359 +3161,409 @@ msgstr ""
 "Armando V. <synan@rilinux.hr>\n"
 "Vedran M. <rivanvx@gmail.com>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:906
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Nemoguće vezanje na port %s."
 
-#: ../src/dialogs.py:739
-msgid "Maybe you have another running instance of Gajim. File Transfer will be canceled."
-msgstr "Možda već imate pokrenutu jednu instancu Gajima. Prijenos Datoteka će biti prekinut."
+#: ../src/dialogs.py:907
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"canceled."
+msgstr ""
+"Možda već imate pokrenutu jednu instancu Gajima. Prijenos Datoteka će biti "
+"prekinut."
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Zahtjev pretplate za račun %s od %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtjev za pretplatom od %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
+msgstr "Već ste u sobi %s"
+
+#: ../src/dialogs.py:1129
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se pridružiti grupnom razgovoru ukoliko niste spojeni."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružiti se Grupnom Razgovoru sa računom %s"
 
-#: ../src/dialogs.py:1030
-msgid "Invalid room or server name"
-msgstr "Neispravno ime sobe ili poslužitelja"
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
+#, fuzzy
+msgid "Invalid group chat Jabber ID"
+msgstr "Neispravan Jabber ID"
 
-#: ../src/dialogs.py:1031
-msgid "The room name or server name has not allowed characters."
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+#, fuzzy
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Ime sobe ili poslužitelja ima nedozvoljene znakove."
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Sakrije baner u prozoru grupnog razgovora"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započeti Razgovor sa računom %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Započeti Razgovor"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1251
+#, 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 ""
 "Ispunite JID ili nadimak  kontakta kojem želite\n"
 "poslati razgovornu poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078
-#: ../src/dialogs.py:1427
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:1079
-#: ../src/dialogs.py:1428
-#: ../src/dialogs.py:1552
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:1088
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 msgid "Invalid JID"
 msgstr "Neispravan JID"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće učitati \"%s\"."
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promjena lozinke."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Morate unesti lozinku."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165
-#: ../src/notify.py:126
-#: ../src/notify.py:268
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Kontakt Se Prijavio"
 
-#: ../src/dialogs.py:1167
-#: ../src/notify.py:134
-#: ../src/notify.py:270
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Kontakt Se Odjavio"
 
 #. chat message
-#: ../src/dialogs.py:1169
-#: ../src/notify.py:154
-#: ../src/notify.py:272
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:1169
-#: ../src/notify.py:138
-#: ../src/notify.py:272
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nova Jedna Poruka"
 
 #. private message
-#: ../src/dialogs.py:1170
-#: ../src/notify.py:145
-#: ../src/notify.py:273
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:1170
-#: ../src/gajim.py:1044
-#: ../src/notify.py:281
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Novi E-mail"
 
-#: ../src/dialogs.py:1172
-#: ../src/gajim.py:1187
-#: ../src/notify.py:275
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: ../src/dialogs.py:1174
-#: ../src/gajim.py:1022
-#: ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: ../src/dialogs.py:1176
-#: ../src/gajim.py:1222
-#: ../src/gajim.py:1244
-#: ../src/gajim.py:1261
-#: ../src/notify.py:279
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Razmjena Datoteka Završena"
 
-#: ../src/dialogs.py:1177
-#: ../src/gajim.py:1225
-#: ../src/notify.py:279
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: ../src/dialogs.py:1179
-#: ../src/gajim.py:920
-#: ../src/notify.py:283
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: ../src/dialogs.py:1181
-#: ../src/notify.py:118
-#: ../src/notify.py:285
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 msgid "Contact Changed Status"
 msgstr "Kontakt Promjenio Status"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1565
+#, fuzzy, python-format
+msgid "Single Message using account %s"
+msgstr "Jedna Poruka sa računom %s"
+
+#: ../src/dialogs.py:1567
+#, fuzzy, python-format
+msgid "Single Message in account %s"
 msgstr "Jedna Poruka sa računom %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Jedna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Poslati %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1595
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "XML Konzola"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista Privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista Privatnosti za %s"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1887
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
+
+#: ../src/dialogs.py:1890
+#, fuzzy, python-format
+msgid "Order: %s, action: %s"
+msgstr "Opis: %s"
+
+#: ../src/dialogs.py:1932
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmjena pravila</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:2019
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste Privatnosti za %s"
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2117
 msgid "Privacy Lists"
 msgstr "Liste Privatnosti"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Neispravno korisničko ime"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Morate unesti lozinku za novi račun"
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s vas je pozvao u sobu %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Odabir Zvuka"
 
-#: ../src/dialogs.py:2064
-#: ../src/dialogs.py:2107
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Odabir Slike"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje Posebne Obavijesti za %s"
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2478
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2484
 msgid "Condition"
 msgstr "Uvjet"
 
-#: ../src/disco.py:108
+#: ../src/dialogs.py:2605
+#, fuzzy
+msgid "when I am "
+msgstr "kada sam "
+
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Ostali"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:112
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Ukoliko niste spojeni nećete moći pregledati dostupne usluge"
 
-#: ../src/disco.py:490
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje Usluga koristeći račun %s"
 
-#: ../src/disco.py:491
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:628
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Usluga nije pronađena"
 
-#: ../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 "Na adresi koju ste naveli nema usluge ili odgovora. Provjerite adresu i pokušajte ponovo."
+#: ../src/disco.py:642
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Na adresi koju ste naveli nema usluge ili odgovora. Provjerite adresu i "
+"pokušajte ponovo."
 
-#: ../src/disco.py:633
-#: ../src/disco.py:915
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Uslugu nije moguće pretražiti"
 
-#: ../src/disco.py:634
+#: ../src/disco.py:647
 msgid "This type of service does not contain any items to browse."
 msgstr "Ovakav tip usluge ne sadrži stvari za pretraživanje"
 
-#: ../src/disco.py:714
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Pretraga %s koristeći račun %s"
 
-#: ../src/disco.py:753
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:916
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži stvari za pretraživanje"
 
-#: ../src/disco.py:1137
-#: ../src/disco.py:1254
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skeniranje %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Opis"
 
+#. Id column
+#: ../src/disco.py:1489
+msgid "Id"
+msgstr ""
+
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Pretplatite se"
+
+#: ../src/disco.py:1738
+#, fuzzy
+msgid "New post"
+msgstr "Nova Soba"
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Pretplatiti se"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Pretplatiti se"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Datoteka"
@@ -3013,35 +3576,30 @@ msgstr "Vrijeme"
 msgid "Progress"
 msgstr "Napredak"
 
-#: ../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 "Ime datoteke: %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 "veličina: %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:463
 msgid "You"
 msgstr "Vi"
 
 #: ../src/filetransfers_window.py:174
-#: ../src/filetransfers_window.py:224
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošiljatelj: %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:573
 msgid "Recipient: "
 msgstr "Primatelj: "
 
@@ -3054,88 +3612,96 @@ msgstr "Spremljeno u: %s"
 msgid "File transfer completed"
 msgstr "Prijenos datoteka završen"
 
-#: ../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 "Prijenos datoteka prekinut"
 
-#: ../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 "Vezu nije moguće ostvariti."
 
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Primatelj: "
+
+#: ../src/filetransfers_window.py:226
+#, fuzzy, python-format
+msgid "Error message: %s"
+msgstr "Greška pri čitanju datoteke:"
+
+#: ../src/filetransfers_window.py:227
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Prijenos datoteka je zaustavio kontakt na drugoj strani"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:244
 msgid "Choose File to Send..."
 msgstr "Odabir Datoteke za Slanje..."
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:263
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:264
 msgid "This file is being used by another process."
 msgstr "Ovu datoteku koristi neki drugi proces."
 
-#: ../src/filetransfers_window.py:289
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:301
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %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 vam želi poslati datoteku:"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: ../src/filetransfers_window.py:312
-msgid "A file with this name already exists and you do not have permission to overwrite it."
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
 msgstr "Datoteka sa ovim imenom već postoji i nemate ovlasti prepisati ju."
 
-#: ../src/filetransfers_window.py:319
-#: ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:319
-#: ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Å to želite učiniti?"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U direktorij \"%s\" nije moguće zapisivati"
 
-#: ../src/filetransfers_window.py:331
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate ovlasti stvarati datoteke u ovom direktoriju"
 
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:348
 msgid "Save File as..."
 msgstr "Snimiti Datoteku kao..."
 
 #. 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"
@@ -3143,275 +3709,507 @@ 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 "Neispravna Datoteka"
 
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:536
 msgid "File: "
 msgstr "Datoteka: "
 
-#: ../src/filetransfers_window.py:532
+#: ../src/filetransfers_window.py:540
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati prazne datoteke"
 
-#: ../src/filetransfers_window.py:552
-#: ../src/tooltips.py:511
-#: ../src/tooltips.py:629
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:554
-#: ../src/tooltips.py:633
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Pošiljatelj: "
 
-#: ../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:47
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim treba Xserver za pokretanje. Izlaz..."
+
+#: ../src/gajim.py:51
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim treba pyGTK 2.6 ili viši"
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim needs PyGTK 2.6 ili viši za pokretanje. Izlaz..."
+
+#: ../src/gajim.py:54
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim treba GTK 2.6 ili viši"
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim treba GTK 2.6 ili viši za pokretanje. Izlaz..."
+
+#: ../src/gajim.py:60
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ nema podršku za libglade"
+
+#: ../src/gajim.py:62
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Molimo uklonite svoj trenutni GTK+ i instalirajte posljednju stabilnu "
+"verziju sa %s"
+
+#: ../src/gajim.py:64
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Molimo provjerite da GTK+ i PyGTK imaju podršku za libglade na vašem sustavu"
+
+#: ../src/gajim.py:69
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim treba PySQLite2 za pokretanje"
+
+#: ../src/gajim.py:76
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim treba PySQLite2 za pokretanje"
+
+#: ../src/gajim.py:77
+#, 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:189
+msgid "Gajim is already running"
+msgstr "Gajim je već pokrenut"
+
+#: ../src/gajim.py:190
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"Trenutno je već pokrenuta jedna instanca Gajima\n"
+"Svejedno pokrenuti?"
+
+#: ../src/gajim.py:297
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autorizacija za %s (id: %s)"
+
+#: ../src/gajim.py:298
+msgid "Do you accept this request?"
+msgstr "Prihvaćate li ovaj zahtjev?"
+
+#: ../src/gajim.py:344 ../src/notify.py:430
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Veza"
+
+#: ../src/gajim.py:656
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Tema: %s\n"
+
+#: ../src/gajim.py:701
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "greška prilikom slanja %s ( %s )"
+
+#: ../src/gajim.py:741
+msgid "Authorization accepted"
+msgstr "Autorizacija prihvaćena"
+
+#: ../src/gajim.py:742
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakt \"%s\" vam je dozvolio da vidite njegov ili njezin status."
+
+#: ../src/gajim.py:750
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
+
+#: ../src/gajim.py:751
+msgid "You will always see him or her as offline."
+msgstr "Uvijek ćete vidjeti njega ili nju kao nepriključenog."
+
+#: ../src/gajim.py:794
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt sa \"%s\" ne može biti uspostavljen"
+
+#: ../src/gajim.py:795 ../src/common/connection.py:395
+msgid "Check your connection or try again later."
+msgstr "Provjerite svoju vezu ili pokušajte kasnije."
+
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s je sada %s (%s)"
+
+#: ../src/gajim.py:1040
+msgid "Your passphrase is incorrect"
+msgstr "Vaša lozinka nije točna"
+
+#: ../src/gajim.py:1041
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Trenutno ste spojeni bez OpenPGP ključa."
+
+#: ../src/gajim.py:1143
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Novi E-mail na %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1145
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Imate %d novu E-mail poruku"
+msgstr[1] "Imate %d nove E-mail poruke"
+msgstr[2] "Imate %d novih E-mail poruka"
+
+#. 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:1154
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"Od: %(from_address)s"
+
+#: ../src/gajim.py:1297
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s vam želi poslati datoteku."
+
+#: ../src/gajim.py:1362
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Uspješno ste primili %(filename)s od %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1366
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
+
+#: ../src/gajim.py:1379
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Uspješno ste poslali %(filename)s %(name)s"
+
+#. ft stopped
+#: ../src/gajim.py:1383
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
+
+#: ../src/gajim.py:1489
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1490
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Molimo popunite podatke za vaš novi korisnički račun</b>"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1828
+msgid "Could not save your settings and preferences"
+msgstr "Nije moguće spremanje vaših postavki"
+
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Veza nije dostupna"
+
+#: ../src/gajim.py:2095
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Podrška za Upravljanje Seansama nije dostupna (nedostaje gnome.ui modul)"
+
+#: ../src/gajim-remote.py:66
+#, fuzzy
+msgid "Shows a help on specific command"
 msgstr "prikazuje pomoć za određenu naredbu"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:69
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:70
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:74
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste"
 
-#: ../src/gajim-remote.py:94
-msgid "Popups a window with the next unread message"
+#: ../src/gajim-remote.py:78
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Iskače prozor sa sljedećom nepročitanom porukom"
 
-#: ../src/gajim-remote.py:98
-msgid "Prints a list of all contacts in the roster. Each contact appear on a separate line"
-msgstr "Ispisuje listu svih kontakata na listi. Svaki kontakt pojavljuje se u odvojenoj liniji"
-
-#: ../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 ""
+"Ispisuje listu svih kontakata na listi. Svaki kontakt pojavljuje se u "
+"odvojenoj liniji"
+
+#: ../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 "račun"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:84
 msgid "show only contacts of the given account"
 msgstr "prikaži samo kontakte ovog računa"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:89
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registriranih računa"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:93
 msgid "Changes the status of account or accounts"
 msgstr "Mjenja status jednog računa ili više njih"
 
 #. 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 "jedno od: "
 
-#: ../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 "poruka"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:97
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../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 "izmjena statusa računa \"račun\". Ako nije određeno, pokušaj promjene statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim statusom\""
+#: ../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 ""
+"izmjena statusa računa \"račun\". Ako nije određeno, pokušaj promjene "
+"statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim "
+"statusom\""
 
-#: ../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 "Prikazuje dialog razgovora kako bi mogli slati poruke kontaktu"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontakta sa kojim želite razgovarati"
 
-#: ../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 "ako je označeno, kontak se uzima sa kontakt liste ovog računa"
 
-#: ../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 "Šalje novu poruku kontaktu na listi, OpenPGP ključ i račun su opcionalni. Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo podesite 'OpenPGP ključ' 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 ""
+"Šalje novu poruku kontaktu na listi, OpenPGP ključ i račun su opcionalni. "
+"Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo podesite "
+"'OpenPGP ključ' 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 kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: ../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 ključ"
 
-#: ../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 "ako je označeno, poruka će biti kriptirana koristeći ovaj javni ključ"
 
-#: ../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 "ako je označeno, poruka će biti poslana koristeći ovaj račun"
 
-#: ../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 "Šalje novu poruku kontaktu na listi, OpenPGP i račun su opcionalni. Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo podesite 'OpenPGP ključ' 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 ""
+"Šalje novu poruku kontaktu na listi, OpenPGP i račun su opcionalni. Ako "
+"želite postaviti samo 'račun', bez 'OpenPGP ključa', samo podesite 'OpenPGP "
+"ključ' na ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:131
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:140
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije 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 kontakta"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:146
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o računu"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:148
 msgid "Name of the account"
 msgstr "Ime računa"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:152
 msgid "Sends file to a contact"
 msgstr "Å alje datoteku kontaktu"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:154
 msgid "File path"
 msgstr "Putanja datoteke"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:156
 msgid "if specified, file will be sent using this account"
 msgstr "ako je označeno, datoteka će biti poslana koriteći ovaj račun"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:161
 msgid "Lists all preferences and their values"
 msgstr "Prikatuje sve postavke i njihove vrijednosti"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:165
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrijednost 'ključa' na 'vrijednost'."
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:167
 msgid "key=value"
 msgstr "ključ=vrijednost"
 
-#: ../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 "'ključ' je ime postavke, 'vrijednost' je vrijednost na koju će se postaviti"
+msgstr ""
+"'ključ' je ime postavke, 'vrijednost' je vrijednost na koju će se postaviti"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:172
 msgid "Deletes a preference item"
 msgstr "Briše element postavke"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:174
 msgid "name of the preference to be deleted"
 msgstr "ime postavke koja će se brisati"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:178
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim postavku u .config datoteku"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:183
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:192
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../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 novi kontakt ovom računu"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ukoliko nije određen račun)"
 
-#: ../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 "Vraća trenutnu statusnu poruku (globalnu ukoliko nije određen račun)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote.py:234
-msgid "Open 'Start Chat' dialog"
+#: ../src/gajim-remote.py:218
+#, fuzzy
+msgid "Opens 'Start Chat' dialog"
 msgstr "Otvaranje dialoga 'Započeti Razgovor'"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:220
 msgid "Starts chat, using this account"
 msgstr "Započinje razgovor, koristeći ovaj račun"
 
-#: ../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 "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:268
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3420,16 +4218,11 @@ msgstr ""
 "'%s' nije na vašoj listi.\n"
 "Molimo odredite račun za slanje poruke."
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:271
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:321
-#, python-format
-msgid "Unknown D-Bus version: %s"
-msgstr "Nepoznata verzija D-Busa: %s"
-
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3438,16 +4231,16 @@ msgstr ""
 "Korištenje: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:338
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:342
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:359
+#: ../src/gajim-remote.py:346
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3456,7 +4249,7 @@ msgstr ""
 "Korištenje: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:433
+#: ../src/gajim-remote.py:420
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3465,313 +4258,119 @@ msgstr ""
 "Argument \"%s\" nije određen. \n"
 "Unesite \"%s help %s\" za više informacija"
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim treba Xserver za pokretanje. Izlaz..."
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim treba pyGTK 2.6 ili viši"
-
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim needs PyGTK 2.6 ili viši za pokretanje. Izlaz..."
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim treba GTK 2.6 ili viši"
-
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim treba GTK 2.6 ili viši za pokretanje. Izlaz..."
-
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ nema podršku za libglade"
-
-#: ../src/gajim.py:63
-#, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Molimo uklonite svoj trenutni GTK+ i instalirajte posljednju stabilnu verziju sa %s"
-
-#: ../src/gajim.py:65
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Molimo provjerite da GTK+ i PyGTK imaju podršku za libglade na vašem sustavu"
-
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim treba PySQLite2 za pokretanje"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:151
-msgid "Gajim is already running"
-msgstr "Gajim je već pokrenut"
-
-#: ../src/gajim.py:152
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Trenutno je već pokrenuta jedna instanca Gajima\n"
-"Svejedno pokrenuti?"
-
-#: ../src/gajim.py:267
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autorizacija za %s (id: %s)"
-
-#: ../src/gajim.py:268
-msgid "Do you accept this request?"
-msgstr "Prihvaćate li ovaj zahtjev?"
-
-#: ../src/gajim.py:611
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "greška prilikom slanja %s ( %s )"
-
-#: ../src/gajim.py:651
-msgid "Authorization accepted"
-msgstr "Autorizacija prihvaćena"
-
-#: ../src/gajim.py:652
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakt \"%s\" vam je dozvolio da vidite njegov ili njezin status."
-
-#: ../src/gajim.py:660
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
-
-#: ../src/gajim.py:661
-msgid "You will always see him or her as offline."
-msgstr "Uvijek ćete vidjeti njega ili nju kao nepriključenog."
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt sa \"%s\" ne može biti uspostavljen"
-
-#: ../src/gajim.py:705
-#: ../src/common/connection.py:398
-msgid "Check your connection or try again later."
-msgstr "Provjerite svoju vezu ili pokušajte kasnije."
-
-#: ../src/gajim.py:849
-#: ../src/roster_window.py:1025
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s je sada %s (%s)"
-
-#: ../src/gajim.py:930
-msgid "Your passphrase is incorrect"
-msgstr "Vaša lozinka nije točna"
-
-#: ../src/gajim.py:931
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Trenutno ste spojeni bez OpenPGP ključa."
-
-#. FIXME: find a better image
-#: ../src/gajim.py:1033
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
-msgstr "Novi E-mail 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] "Imate %d novu E-mail poruku"
-msgstr[1] "Imate %d nove E-mail poruke"
-msgstr[2] "Imate %d novih E-mail poruka"
-
-#. 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 vam želi poslati datoteku."
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Uspješno ste primili %(filename)s od %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
-
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Uspješno ste poslali %(filename)s %(name)s"
-
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
-
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
-msgstr "Objava vCard uspješna"
-
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
-msgstr "Vaši osobni podaci su uspješno objavljeni."
-
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
-msgstr "Objava vCard neuspješna"
-
-#: ../src/gajim.py:1304
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte ponovno kasnije."
-
-#. 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 "Nije moguće spremanje vaših postavki"
-
-#: ../src/gajim.py:1903
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Podrška za Upravljanje Seansama nije dostupna (nedostaje gnome.ui modul)"
-
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Selim Zapise..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Pričekajte dok se odvija selidba zapisa..."
-
-#: ../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 "ime teme"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "Ne možete izbrisati svoju trenutnu temu"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Molimo vas da prvo odaberete neku drugu temu za trenutnu."
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chat"
 msgstr "Privatni Razgovor"
 
-#: ../src/groupchat_control.py:99
+#: ../src/groupchat_control.py:103
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: ../src/groupchat_control.py:115
+#: ../src/groupchat_control.py:120
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:117
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:122
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Više niste u sobi \"%s\" ili je \"%s\" otišao."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chat"
 msgstr "Grupni Razgovor"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:141
 msgid "Group Chats"
 msgstr "Grupni Razgovori"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:315
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
-#: ../src/groupchat_control.py:702
-msgid "This room has no subject"
-msgstr "Ova soba nema naslov"
-
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:793
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:804
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup od strane %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s je od sada poznat kao %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s je napustio"
 
-#: ../src/groupchat_control.py:902
-#, python-format
-msgid "%s has joined the room"
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
 msgstr "%s se pridružio sobi"
 
 #. No status message
-#: ../src/groupchat_control.py:904
-#: ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je sada %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:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nadimak nije pronađen: %s "
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
+msgstr "Ova soba nema naslov"
+
+#: ../src/groupchat_control.py:1067
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozvali ste %(contact_jid)s na %(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:1074 ../src/groupchat_control.py:1102
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ne izgleda kao valjani JID"
@@ -3779,696 +4378,880 @@ msgstr "%s ne izgleda kao valjani JID"
 #: ../src/groupchat_control.py:1185
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Ne postoji komanda: /%s (ako želite poslati to kao poruku, prefiksirajte je sa /say)"
+msgstr ""
+"Ne postoji komanda: /%s (ako želite poslati to kao poruku, prefiksirajte je "
+"sa /say)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Komanda: %s"
 
-#: ../src/groupchat_control.py:1209
-#, 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 "Korištenje: /%s <nickname|JID> [razlog], je zabranio pristup JID-u u sobu. Nadimak učesnika može biti zamijenjen, ali ne ako sadrži \"@\". Ako je JID trenutno u sobi, on/ona/ono će biti izbačen(a/o). Razmaci u imenima nisu podržani."
+#: ../src/groupchat_control.py:1210
+#, fuzzy, python-format
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+msgstr ""
+"Korištenje: /%s <nickname|JID> [razlog], je zabranio pristup JID-u u sobu. "
+"Nadimak učesnika može biti zamijenjen, ali ne ako sadrži \"@\". Ako je JID "
+"trenutno u sobi, on/ona/ono će biti izbačen(a/o). Razmaci u imenima nisu "
+"podržani."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1217
 #, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
-msgstr "Način korištenja: /%s <nickname>, otvara privatni razgovor sa učesnikom"
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+msgstr ""
+"Način korištenja: /%s <nickname>, otvara privatni razgovor sa učesnikom"
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Način korištenja: /%s, prazni tekstualni prozor"
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1223
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Način korištenja: /%s [razlog], zatvara trenutni prozor ili tab, i prikazuje razlog ako je specificiran."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Način korištenja: /%s [razlog], zatvara trenutni prozor ili tab, i prikazuje "
+"razlog ako je specificiran."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Način korištenja: /%s, sakriva dugmadi."
 
-#: ../src/groupchat_control.py:1226
-#, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current room, optionally providing a reason."
-msgstr "Način korištenja: /%s <JID> [razlog], poziva JID u trenutnu sobu, opcionalno dajući razlog."
-
-#: ../src/groupchat_control.py:1230
-#, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Način korištenja: /%s <soba>@<poslužitelj>[/nadimak], nudi mogućnost spajanja na sobu@poslužitelj koristeći navedeni nadimak."
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Način korištenja: /%s <JID> [razlog], poziva JID u trenutnu sobu, opcionalno "
+"dajući razlog."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1233
 #, 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 "Način korištenja: /%s <nickname> [razlog], uklanja učesnika specificiranog nadimkom iz sobe i opcionalno prikazuje razlog. NE podržava razmake u nadimku."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Način korištenja: /%s <soba>@<poslužitelj>[/nadimak], nudi mogućnost "
+"spajanja na sobu@poslužitelj koristeći navedeni nadimak."
 
-#: ../src/groupchat_control.py:1239
-#, python-format
-msgid "Usage: /%s <action>, sends action to the current room. Use third person. (e.g. /%s explodes.)"
-msgstr "Način korištenja: /%s <action>, šalje akciju trenutnoj sobi. Koristi treću osobu. (npr. /%s eksplodira.)"
+#: ../src/groupchat_control.py:1237
+#, fuzzy, python-format
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Način korištenja: /%s <nickname> [razlog], uklanja učesnika specificiranog "
+"nadimkom iz sobe i opcionalno prikazuje razlog. NE podržava razmake u "
+"nadimku."
 
-#: ../src/groupchat_control.py:1243
-msgid "Usage: /%s <nickname> [message], opens a private message windowand sends message to the occupant specified by nickname."
-msgstr "Način korištenja: /%s <nickname> [poruka], otvara prozor privatne poruke i šalje poruku učesniku specificiranom pomoću nadimka."
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"Način korištenja: /%s <action>, šalje akciju trenutnoj sobi. Koristi treću "
+"osobu. (npr. /%s eksplodira.)"
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1246
 #, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
-msgstr "Način korištenja: /%s <nickname>, mijenja vaš nadimak u trenutnoj sobi."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Način korištenja: /%s <nickname> [poruka], otvara prozor privatne poruke i "
+"šalje poruku učesniku specificiranom pomoću nadimka."
 
-#: ../src/groupchat_control.py:1252
-msgid "Usage: /%s , display the names of room occupants."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+msgstr ""
+"Način korištenja: /%s <nickname>, mijenja vaš nadimak u trenutnoj sobi."
+
+#: ../src/groupchat_control.py:1255
+#, fuzzy, python-format
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Način korištenja: /%s , prikazuje imena učesnika u sobi."
 
-#: ../src/groupchat_control.py:1256
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Način korištenja: /%s [tema], prikazuje ili ažurira temu sobe."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1262
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Način korištenja: /%s <message>, šalje poruku bez gledanja za ostale komande."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Način korištenja: /%s <message>, šalje poruku bez gledanja za ostale komande."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Nema informacija ni pomoći za /%s"
 
-#: ../src/groupchat_control.py:1304
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Želite li napustiti sobu \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Ako zatvorite ovaj prozor, biti ćete odspojen iz sobe."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Mijenjanje Teme"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Molimo specificirajte novu temu:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Mijenjam Nadimak"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molimo specificirajte novi nadimak ako ga želite koristiti:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Knjižna oznaka je već postavljena"
 
-#: ../src/groupchat_control.py:1380
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/groupchat_control.py:1391
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Soba \"%s\" je već u vašim knjižnim oznakama."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Knjižna oznaka je bez uspješno dodana"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1401
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Možete upravljati vašim knjižnim oznakama pomoću izbornika Akcije u vašem spisku."
+msgstr ""
+"Možete upravljati vašim knjižnim oznakama pomoću izbornika Akcije u vašem "
+"spisku."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:1501
-#: ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Možete specificirati razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem pristup %s"
 
-#: ../src/gtkexcepthook.py:51
+#: ../src/gtkexcepthook.py:41
 msgid "A programming error has been detected"
 msgstr "Otkrivena je bila greška u programiranju"
 
-#: ../src/gtkexcepthook.py:52
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Najvjerojatnije nije kobna, ali ipak preporučamo, da ju javite programerima."
+#: ../src/gtkexcepthook.py:42
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Najvjerojatnije nije kobna, ali ipak preporučamo, da ju javite programerima."
 
-#: ../src/gtkexcepthook.py:58
+#: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
 msgstr "_Prijavi Grešku"
 
-#: ../src/gtkexcepthook.py:81
+#: ../src/gtkexcepthook.py:71
 msgid "Details"
 msgstr "Detalji"
 
 #. 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 "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/gtkgui_helpers.py:298
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:301
+#: ../src/gtkgui_helpers.py:296
 msgid "Error parsing file:"
 msgstr "Greška pri učitavanju datoteke:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:334
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Nije moguće pisati u %s. Rukovanje sesijama neće biti moguće"
 
-#: ../src/gtkgui_helpers.py:717
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr "Produžetak nije podržan"
 
-#: ../src/gtkgui_helpers.py:718
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Sliku nije moguće spremiti u %(type)s formatu. Spremiti kao %(new_filename)s?"
+msgstr ""
+"Sliku nije moguće spremiti u %(type)s formatu. Spremiti kao %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:737
 msgid "Save Image as..."
 msgstr "Snimiti Sliku kao..."
 
-#: ../src/history_manager.py:61
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći bazu podataka zabilješki povijesti"
 
 #. holds jid
-#: ../src/history_manager.py:104
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Kontakti"
 
 #. holds time
-#: ../src/history_manager.py:117
-#: ../src/history_manager.py:157
-#: ../src/history_window.py:85
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
+#: ../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:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. holds message
-#: ../src/history_manager.py:131
-#: ../src/history_manager.py:163
-#: ../src/history_window.py:93
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
+#: ../src/history_window.py:94
 msgid "Message"
 msgstr "Poruka"
 
 #. holds subject
-#: ../src/history_manager.py:138
-#: ../src/history_manager.py:169
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Tema"
 
-#: ../src/history_manager.py:183
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Želite li očistiti bazu podataka? (NE PREPORUČUJEMO UKOLIKO JE GAJIM POKRENUT)"
+#: ../src/history_manager.py:186
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Želite li očistiti bazu podataka? (NE PREPORUČUJEMO UKOLIKO JE GAJIM "
+"POKRENUT)"
 
-#: ../src/history_manager.py:185
+#: ../src/history_manager.py:188
 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 ""
-"Uobičajeno, veličina prikupljenog prostora za bazu podataka neće biti oslobođena, samo će postati ponovo koristiva. Ukoliko zaista želite smanjiti veličinu baze podataka, pritisnite Da, inače pritisnite Ne.\n"
+"Uobičajeno, veličina prikupljenog prostora za bazu podataka neće biti "
+"oslobođena, samo će postati ponovo koristiva. Ukoliko zaista želite smanjiti "
+"veličinu baze podataka, pritisnite Da, inače pritisnite Ne.\n"
 "\n"
 "Ukoliko pritisnite Da, pričekajte..."
 
-#: ../src/history_manager.py:391
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Izvozim Zabilješke Povijesti..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:476
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s kaže: %(message)s\n"
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr "tko"
-
-#: ../src/history_manager.py:505
+#: ../src/history_manager.py:514
 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] "Da li zaista želite ukloniti zabilješke odabranog kontakta?"
 msgstr[1] "Da li zaista želite ukloniti zabilješke odabranih kontakata?"
 msgstr[2] ""
 
-#: ../src/history_manager.py:509
-#: ../src/history_manager.py:545
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Ovo je nepovratna operacija."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:551
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Da li zaista želite ukloniti odabranu poruku?"
 msgstr[1] "Da li zaista želite ukloniti odabrane poruke?"
 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 "Povijest Razgovora sa %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 trenutno %(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 trenutno %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:271
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stauts je trenutno: %(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 trenutno: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Poruke"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:274
 #, 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 je Promjenio Status"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:206
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Se Prijavio"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Se Odjavio"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:226
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Jedna Poruka 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 "Nova Privatna Poruka iz sobe %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 poruka od %(nickname)s"
 
-#: ../src/roster_window.py:131
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
+msgid "Retrieving profile..."
+msgstr ""
+
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
+msgid "Click to set your avatar"
+msgstr ""
+
+#. keep identation
+#: ../src/profile_window.py:136
+msgid "Could not load image"
+msgstr "Nemogu učitati sliku"
+
+#: ../src/profile_window.py:238
+#, fuzzy
+msgid "Information received"
+msgstr "Primljen Poziv"
+
+#: ../src/profile_window.py:308
+msgid "Without a connection you can not publish your contact information."
+msgstr "Bez veze ne možete objaviti informacije o sebi"
+
+#: ../src/profile_window.py:320
+msgid "Sending profile..."
+msgstr ""
+
+#: ../src/profile_window.py:328
+msgid "Information published"
+msgstr ""
+
+#: ../src/profile_window.py:340
+msgid "Information NOT published"
+msgstr ""
+
+#: ../src/profile_window.py:347
+msgid "vCard publication failed"
+msgstr "Objava vCard neuspješna"
+
+#: ../src/profile_window.py:348
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte "
+"ponovno kasnije."
+
+#: ../src/profile_window.py:374
+msgid "Without a connection, you can not get your contact information."
+msgstr "Bez veze ne možete dobiti informacije o kontaktu."
+
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Spojeni računi"
 
-#: ../src/roster_window.py:288
-#: ../src/common/helpers.py:39
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Već ste u sobi %s"
-
-#: ../src/roster_window.py:548
-#: ../src/roster_window.py:2280
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Nije moguće pridruživanje sobi dok ste nevidljivi"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "koristeći račun %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "na %s račun"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:763
-#: ../src/systray.py:193
-#: ../src/systray.py:198
-#, python-format
-msgid "using account %s"
-msgstr "koristeći račun %s"
-
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "računa %s"
 
-#: ../src/roster_window.py:831
-msgid "Manage Bookmarks..."
+#: ../src/roster_window.py:1003
+#, fuzzy
+msgid "_Manage Bookmarks..."
 msgstr "Upravljanje Knjižnim Oznakama..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "za račun %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Upravitelj Povijesti"
 
-#: ../src/roster_window.py:885
-msgid "_Join New Room"
-msgstr "_Pridruživanje Novoj Sobi"
+#: ../src/roster_window.py:1062
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Pridružiti se Grupnom Razgovoru"
+
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
+msgid "You have unread messages"
+msgstr "Imte nepročitane poruke"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1385
+#, fuzzy
+msgid "You must read them before removing this transport."
+msgstr "Pročitajte sve događaje na čekanju prije uklanjanja ovog računa."
+
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Prijenos \"%s\" biti će uklonjen"
 
-#: ../src/roster_window.py:1159
-msgid "You will no longer be able to send and receive messages to contacts from this transport."
-msgstr "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima ovog prijenosa."
+#: ../src/roster_window.py:1389
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
+msgstr ""
+"Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima ovog "
+"prijenosa."
+
+#: ../src/roster_window.py:1392
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "Prijenos \"%s\" biti će uklonjen"
+
+#: ../src/roster_window.py:1397
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima ovog "
+"prijenosa."
+
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Kontakti"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Unesite lozinku GPG ključa za račun %s."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Preimenuj"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Unesite lozinku GPG ključa za račun %s."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Ukloni"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Uklanja kontakt sa liste"
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Dodjeli OpenPGP Ključ"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za dodavanje kontaktu"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
+#, fuzzy
+msgid "_New group chat"
+msgstr "_Grupni Razgovor"
+
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Želio bih vas dodati na svoju listu kontakata"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "_Pošalji Poslužiteljsku Poruku"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Pre_imenuj"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+msgid "To all online users"
+msgstr ""
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Prijava"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Odjava"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Izmjena Statusne Poruke"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Odobrenje je poslano"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će \"%s\" znati vaš status."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Zahtjev za pretplatom je poslan"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:2401
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ako \"%s\" prihvati ovaj zahtjev znati će te njegov/njezin status."
 
-#: ../src/roster_window.py:1658
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Odobrenje je uklonjeno"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" biti će uklonjen sa vaše liste kontakata"
 
-#: ../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 "Uklanjanjem ovog kontakta ujedno i uklanjate odobrenje što konačno znači da će vas ta osoba uvijek vidjeti kao da ste odspojeni."
+#: ../src/roster_window.py:2621
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Uklanjanjem ovog kontakta ujedno i uklanjate odobrenje što konačno znači da "
+"će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
-#: ../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 "Uklanjanjem ovog kontakta ujedno po pretpostavljenom uklanjate i odobrenje što konačno znači da će vas ta osoba uvijek vidjeti kao da ste odspojeni."
+#: ../src/roster_window.py:2626
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"Uklanjanjem ovog kontakta ujedno po pretpostavljenom uklanjate i odobrenje "
+"što konačno znači da će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status nakon uklanjanja"
 
-#: ../src/roster_window.py:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2633
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "Kontakt \"%s\" biti će uklonjen sa vaše liste kontakata"
+
+#: ../src/roster_window.py:2637
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Uklanjanjem ovog kontakta ujedno i uklanjate odobrenje što konačno znači da "
+"će vas ta osoba uvijek vidjeti kao da ste odspojeni."
+
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Unesite lozinku GPG ključa za račun %s."
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Sačuvati lozinku"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Kriva Lozinka"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Molimo ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
 
-#: ../src/roster_window.py:1963
-#: ../src/roster_window.py:2020
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Sudjelujete u jednom ili više grupnih razovora"
 
-#: ../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 "Promjena vašeg statusa u nevidljivo rezultirati će odspajanjem sa tih grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Promjena vašeg statusa u nevidljivo rezultirati će odspajanjem sa tih "
+"grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Nema dostupnih računa"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2800
 msgid "You must create an account before you can chat with other contacts."
-msgstr "Morate stvoriti račun prije nego što možete razgovarati sa drugim kontaktima."
+msgstr ""
+"Morate stvoriti račun prije nego što možete razgovarati sa drugim kontaktima."
 
-#: ../src/roster_window.py:2452
-#: ../src/roster_window.py:2458
-msgid "You have unread messages"
-msgstr "Imte nepročitane poruke"
+#: ../src/roster_window.py:2898
+#, 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 "Poruke će biti dostupne za čitanje i kasnije ukoliko imate omogućenu povijest."
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
+msgstr ""
+"Poruke će biti dostupne za čitanje i kasnije ukoliko imate omogućenu "
+"povijest."
+
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Morate stvoriti račun prije nego što možete razgovarati sa drugim kontaktima."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Spusti %s u grupu %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Učini %s i %s pseudokontaktima"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Promijeni Statusnu Poruku..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Promijeni Statusnu Poruku..."
 
-#: ../src/systray.py:231
+#: ../src/systray.py:234
 msgid "Hide this menu"
 msgstr "Sakrij ovaj izbornik"
 
-#: ../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 nepročitana poruka"
-msgstr[1] "Gajim - %d nepročitanih poruka"
-msgstr[2] ""
-
-#: ../src/tooltips.py:326
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d nepročitana poruka"
-msgstr[1] "%d nepročitanih poruka"
-
-#: ../src/tooltips.py:332
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d nepročitana jedna poruka"
-msgstr[1] "%d nepročitanih jednih poruka"
-
-#: ../src/tooltips.py:338
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d nepročitana poruka grupnih razgovora"
-msgstr[1] "%d nepročitanih poruka grupnih razgovora"
-
-#: ../src/tooltips.py:344
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d nepročitana privatna poruka"
-msgstr[1] "%d nepročitanih privatnih poruka"
-
-#: ../src/tooltips.py:359
-#: ../src/tooltips.py:361
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: ../src/tooltips.py:395
-msgid "Role: "
-msgstr "Uloga: "
-
-#: ../src/tooltips.py:396
-msgid "Affiliation: "
-msgstr "Pripadnost: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:398
-#: ../src/tooltips.py:537
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:407
-#: ../src/tooltips.py:540
-#: ../src/tooltips.py:565
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:317
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this group chat"
+msgstr ""
+
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:514
+#: ../src/tooltips.py:461
+#, fuzzy, python-format
+msgid "Last status: %s"
+msgstr "Zadnji status na %s"
+
+#: ../src/tooltips.py:463
+#, fuzzy, python-format
+msgid " since %s"
+msgstr "od %s"
+
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:512
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:570
-#, python-format
-msgid "Last status on %s"
-msgstr "Zadnji status na %s"
-
-#: ../src/tooltips.py:572
-#, python-format
-msgid "Since %s"
-msgstr "Od %s"
-
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Podizanje"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:654
-#: ../src/tooltips.py:675
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Nije početo"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:660
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Završeno"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Prenosim"
 
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis nije još pružio detaljnije informacije"
 
-#: ../src/tooltips.py:708
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4476,135 +5259,124 @@ msgstr ""
 "Ova usluga nije mogla odgovoriti sa detaljnim informacijama.\n"
 "Najvjerojatnije je zastarjela ili neispravna"
 
-#. keep identation
-#: ../src/vcard.py:188
-msgid "Could not load image"
-msgstr "Nemogu učitati sliku"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, 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 "Ovaj kontakt je zainteresiran za informacije o vašem prisutstvu, ali vas ne zanimaju informacije o njegovom/njenom prisustvu"
+#: ../src/vcard.py:277
+#, fuzzy
+msgid "Affiliation:"
+msgstr "Pripadnost: "
 
-#: ../src/vcard.py:334
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Vi ste zainteresirani za informacije o prisustvu nekog kontakta, ali nju/njega ne interesira vaše prisutstvo"
+#: ../src/vcard.py:285
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Ovaj kontakt je zainteresiran za informacije o vašem prisutstvu, ali vas ne "
+"zanimaju informacije o njegovom/njenom prisustvu"
+
+#: ../src/vcard.py:287
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Vi ste zainteresirani za informacije o prisustvu nekog kontakta, ali nju/"
+"njega ne interesira vaše prisutstvo"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:289
 msgid "You and the contact are interested in each other's presence information"
-msgstr "Vi i vaš kontakt ste zainteresirani za informacije o prisustvu jedno drugog"
+msgstr ""
+"Vi i vaš kontakt ste zainteresirani za informacije o prisustvu jedno drugog"
 
 #. None
-#: ../src/vcard.py:338
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Ne interesira vas prisutnost kontakta, niti vaša prisutnost zanima njega/nju"
+#: ../src/vcard.py:291
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Ne interesira vas prisutnost kontakta, niti vaša prisutnost zanima njega/nju"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:299
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o vašem zahtjevu za pretplatom"
 
-#: ../src/vcard.py:359
-#: ../src/vcard.py:382
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " resurs s prioritetom "
 
-#: ../src/vcard.py:458
-msgid "Without a connection you can not publish your contact information."
-msgstr "Bez veze ne možete objaviti informacije o sebi"
-
-#: ../src/vcard.py:491
-msgid "Without a connection, you can not get your contact information."
-msgstr "Bez veze ne možete dobiti informacije o kontaktu."
-
-#: ../src/vcard.py:495
-msgid "Personal details"
-msgstr "Osobni detalji"
-
-#: ../src/common/check_paths.py:35
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "kreiram bazu zabilješki"
 
-#: ../src/common/check_paths.py:82
-#: ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s je datoteka ali bi trebao biti direktorij"
 
-#: ../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:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim će se sad isključiti"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s je direktorij ali bi trebao biti datoteka"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram %s direktorij"
 
-#: ../src/common/exceptions.py:32
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (poznat kao python-pysqlite2) nedostaje. Izlazim..."
-
-#: ../src/common/exceptions.py:40
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Servis nije dostupan: Gajim nije pokrenut ili je remote_control Neistinito"
-
-#: ../src/common/exceptions.py:48
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus nije namješten na ovom sustavu ili nema python modula."
-
-#: ../src/common/exceptions.py:56
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Sesijska sabirnica nije dostupna.\n"
-"Pokušajte pročitati http:/trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/config.py:51
-msgid "Use DBus and Notification-Daemon to show notifications"
+#: ../src/common/config.py:55
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Koristi DBus i Obavještajni-Demon za prikazivanje obavijesti"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to away."
-msgstr "Vrijeme u minutama, nako kojega će se vaš status promijeniti u odsutan."
+msgstr ""
+"Vrijeme u minutama, nako kojega će se vaš status promijeniti u odsutan."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Odsutan, kao posljedica mirovanja"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:63
 msgid "Time in minutes, after which your status changes to not available."
-msgstr "Vrijeme u minutama, nakon kojega će se vaš status promijenti u nije dostupan."
+msgstr ""
+"Vrijeme u minutama, nakon kojega će se vaš status promijenti u nije dostupan."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Nije dostupan, kao posljedica mirovanja."
 
-#: ../src/common/config.py:77
-msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+#: ../src/common/config.py:82
+#, fuzzy
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (odvojena razmacima) redova (računa i grupa) koji su otvoreni"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:87
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:91
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -4614,352 +5386,703 @@ msgstr ""
 "'ponekad' - ispisuj vrijeme svakih print_ichat_every_foo_minutes minuta.\n"
 "'nikada' - nikada ne ispisuj vrijeme."
 
-#: ../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 "Vrijednost nejasnoće od 1 do 4 ili 0 za onemogućavanje nejasnog sata. 1 je najprecizniji sat, 4 najneprecizniji."
+#: ../src/common/config.py:92
+#, 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 ""
+"Vrijednost nejasnoće od 1 do 4 ili 0 za onemogućavanje nejasnog sata. 1 je "
+"najprecizniji sat, 4 najneprecizniji."
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Koristi * / _ parove kao znakove za formatiranje."
 
-#: ../src/common/config.py:88
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Ako je Istinito, nemoj odstraniti */_ . Tako će *abc* biti podebljano, ali omeđeno sa * *."
-
-#: ../src/common/config.py:98
-msgid "Character to add after nickname when using nick completion (tab) in group chat"
-msgstr "Znak za dodavanje nakon nadimka pri korištenju završavanja nadimka (tipka tab) u grupnom razgovoru"
+#: ../src/common/config.py:96
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Ako je Istinito, nemoj odstraniti */_ . Tako će *abc* biti podebljano, ali "
+"omeđeno sa * *."
 
 #: ../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 koji treba pokušati dodati željenom nadimku ukoliko netko u grupnom razgovoru već koristi željeni nadimak"
+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:108
+#, fuzzy
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak za dodavanje nakon nadimka pri korištenju završavanja nadimka (tipka "
+"tab) u grupnom razgovoru"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:109
+#, fuzzy
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Znak koji treba pokušati dodati željenom nadimku ukoliko netko u grupnom "
+"razgovoru već koristi željeni nadimak"
+
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Dodaj * i [n] u naslov liste?"
 
-#: ../src/common/config.py:132
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Koliko će se linija pamtiti iz prošlih razgovora kada se prozor/tab razgovora ponovno otvori."
+#: ../src/common/config.py:143
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Koliko će se linija pamtiti iz prošlih razgovora kada se prozor/tab "
+"razgovora ponovno otvori."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:144
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Koliko minuta trebaju trajati linije iz prošlog razgovora."
 
-#: ../src/common/config.py:134
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Pošalji poruku sa Ctrl+Enter i sa Enter napravi novu liniju. (Pretpostavljeno ponašanje Mirabilis ICQ klijenta)"
+#: ../src/common/config.py:145
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Pošalji poruku sa Ctrl+Enter i sa Enter napravi novu liniju. "
+"(Pretpostavljeno ponašanje Mirabilis ICQ klijenta)"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koliko linija se sprema za Ctrl+TipkaGORE"
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:150
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Ili je osobni url sa %s u njemu gdje je %s riječ ili fraza ili 'WIKTIONARY' sta znaci da koristi wiktionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Ili je osobni url sa %s u njemu gdje je %s riječ ili fraza ili 'WIKTIONARY' "
+"sta znaci da koristi wiktionary."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:153
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ako je označeno, Gajim se može kontrolirati preko gajim-remote-a."
 
-#: ../src/common/config.py:145
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes"
-msgstr "Ako se ne ispisuje vrijeme za svaku poruku (print_time==ponekad), ispisati ga svakih x minuta"
+#: ../src/common/config.py:154
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:158
+#, fuzzy
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Ako se ne ispisuje vrijeme za svaku poruku (print_time==ponekad), ispisati "
+"ga svakih x minuta"
+
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj prije zatvaranja taba/prozora razgovora grupe."
 
-#: ../src/common/config.py:147
-msgid "Always ask before closing group chat tab/window in this space separated list of room jids."
-msgstr "Uvijek pitaj prije zatvaranja taba/prozora razgovora grupe u ovoj razmakom odjeljenoj listi JID konatakta."
+#: ../src/common/config.py:160
+#, fuzzy
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Uvijek pitaj prije zatvaranja taba/prozora razgovora grupe u ovoj razmakom "
+"odjeljenoj listi JID konatakta."
 
-#: ../src/common/config.py:148
-msgid "Never ask before closing group chat tab/window in this space separated list of room jids."
-msgstr "Nikad ne pitaj prije zatvaranja taba/prozora razgovora grupe u ovoj razmacima podjeljenoj listi JID kontakata."
+#: ../src/common/config.py:161
+#, fuzzy
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Nikad ne pitaj prije zatvaranja taba/prozora razgovora grupe u ovoj "
+"razmacima podjeljenoj listi JID kontakata."
 
-#: ../src/common/config.py:151
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Prepisuje poslužitelja kojega koristimo za prijenos datoteka u slučaju prosljeđivanja"
+#: ../src/common/config.py:164
+msgid ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+msgstr ""
+"Prepisuje poslužitelja kojega koristimo za prijenos datoteka u slučaju "
+"prosljeđivanja"
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard definira KiB = 1024 bajtova, KB = 1000 bajtova"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži tab ako je otvoren samo jedan razgovor?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaži granicu notesa sa tabovima u prozorima razgovora?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Prikaži dugme za zatvaranje u tabu?"
 
-#: ../src/common/config.py:176
-msgid "A semicolon-separated list of words that will be highlighted in multi-user chat."
-msgstr "Lista riječi podjeljena točka-zarezom će biti označena u razgovoru više korisnika."
+#: ../src/common/config.py:189
+#, fuzzy
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Lista riječi podjeljena točka-zarezom će biti označena u razgovoru više "
+"korisnika."
 
-#: ../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 "Ako je Istinito, Gajim se završava kad je pritisnuto X dugme. Ova postavka je upotrebljena samo ako je trayicon u upotrebi."
+#: ../src/common/config.py:190
+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 ""
+"Ako je Istinito, Gajim se završava kad je pritisnuto X dugme. Ova postavka "
+"je upotrebljena samo ako je trayicon u upotrebi."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Ako je Istinito, Gajim registrira za xmpp:// pri svakom pokretanju."
 
-#: ../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 "Ako je Istinito, Gajim će prikazvati ikonu na svakom tabu koji sadrži nepročitane poruke. Ovisno o temi, ikona može biti i animirana."
+#: ../src/common/config.py:192
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Ako je Istinito, Gajim će prikazvati ikonu na svakom tabu koji sadrži "
+"nepročitane poruke. Ovisno o temi, ikona može biti i animirana."
+
+#: ../src/common/config.py:193
+#, fuzzy
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Ako je Istinito, Gajim će prikazivati statusnu poruku, ako nije prazna, za "
+"svaki kontakt pod imenom kontakta na listi."
 
-#: ../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 "Ako je Istinito, Gajim će prikazivati statusnu poruku, ako nije prazna, za svaki kontakt pod imenom kontakta na listi."
+#: ../src/common/config.py:195
+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 ""
+"Ako je Istinito, će Gajim poslati upit za avatar svaki kontakt, koji nije "
+"imao avatar ili je onaj u memoriji prestar"
+
+#: ../src/common/config.py:196
+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 ""
+"Ako je Neistinito, više nećete vidjeti statusnu poruku u razgovorima, kada "
+"kontakt promjeni svoj status i/ili statusnu poruku."
+
+#: ../src/common/config.py:197
+#, 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 "
+"group chat."
+msgstr ""
+"može biti \"ništa\", \"sve\" ili \"ulaz_i_izlaz\". Ako je \"ništa\", Gajim "
+"više neće ispisivati statusnu liniju u grupnim razgovorima kada član "
+"promjeni svoj status ili izmjeni statusnu poruku. Ako je \"sve\" Gajim će "
+"prikazivati sve statusne poruke. Ako je \"ulaz_i_izlaz\" Gajim će "
+"prikazivati samo poruke tipa FOO je ušao/izašao u/iz sobe"
 
-#: ../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 "Ako je Istinito, će Gajim poslati upit za avatar svaki kontakt, koji nije imao avatar ili je onaj u memoriji prestar"
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
 
-#: ../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 "Ako je Neistinito, više nećete vidjeti statusnu poruku u razgovorima, kada kontakt promjeni svoj status i/ili statusnu poruku."
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
 
-#: ../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 "može biti \"ništa\", \"sve\" ili \"ulaz_i_izlaz\". Ako je \"ništa\", Gajim više neće ispisivati statusnu liniju u grupnim razgovorima kada član promjeni svoj status ili izmjeni statusnu poruku. Ako je \"sve\" Gajim će prikazivati sve statusne poruke. Ako je \"ulaz_i_izlaz\" Gajim će prikazivati samo poruke tipa FOO je ušao/izašao u/iz sobe"
+#: ../src/common/config.py:202
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: ../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 "Ako je Istinito, i instalirane verzije GTK+ i PyGTK su barem 2.8, neka prozor bljeska (pretpostavljeno ponašanje u većini Upravitelja Prozorima) pri novim događajima."
+#: ../src/common/config.py:204
+#, fuzzy
+msgid "Don't show roster in the system taskbar."
+msgstr "Ne prikazuj avatar za sam transport."
 
-#: ../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 ne voli sha informacije kada netko uđe u sobu zaštićenu lozinkom. Isključite ovu opciju da prestanete slati sha informacije u obavjestima o prisutnosti u grupnim razgovorima"
+#: ../src/common/config.py:205
+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 ""
+"Ako je Istinito, i instalirane verzije GTK+ i PyGTK su barem 2.8, neka "
+"prozor bljeska (pretpostavljeno ponašanje u većini Upravitelja Prozorima) "
+"pri novim događajima."
+
+#: ../src/common/config.py:207
+#, fuzzy
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 ne voli sha informacije kada netko uđe u sobu zaštićenu lozinkom. "
+"Isključite ovu opciju da prestanete slati sha informacije u obavjestima o "
+"prisutnosti u grupnim razgovorima"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:210
+#, 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 ""
 "'uvijek' - Sve poruke su poslane u isti prozor.\n"
 "'nikad' - Svaka poruka dobiva svoj prozor.\n"
 "'zaracun' - Poruke za svaki račun su poslane u svoj prozor.\n"
-"'zatip' - Svaki tip poruke (npr., razgovori i grupni razgovori) je poslan u svoj prozor. Promjena ove opcije zahtijeva ponovno pokretanje Gajima"
+"'zatip' - Svaki tip poruke (npr., razgovori i grupni razgovori) je poslan u "
+"svoj prozor. Promjena ove opcije zahtijeva ponovno pokretanje Gajima"
 
-#: ../src/common/config.py:195
-msgid "If False, you will no longer see the avatar in the chat window"
+#: ../src/common/config.py:211
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ako je Neistinito, nećete više vidjeti avatar u prozoru razgovora"
 
-#: ../src/common/config.py:196
-msgid "If True, pressing the escape key closes a tab/window"
+#: ../src/common/config.py:212
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ako je Istinito, pritisak na 'esc' tipku zatvara tab/prozor"
 
-#: ../src/common/config.py:197
-msgid "Hides the buttons in group chat window"
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Hides the buttons in group chat window."
 msgstr "Sakrije dugmad u prozoru grupnog razgovora"
 
-#: ../src/common/config.py:198
-msgid "Hides the buttons in two persons chat window"
+#: ../src/common/config.py:214
+#, fuzzy
+msgid "Hides the buttons in two persons chat window."
 msgstr "Sakrije dugme u prozoru razgovora dviju osoba"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Sakrije baner u prozoru grupnog razgovora"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Sakrije baner u prozoru razgovora dviju osoba"
 
-#: ../src/common/config.py:201
-msgid "Hides the room occupants list in groupchat window"
+#: ../src/common/config.py:217
+#, fuzzy
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "Sakrije listu učesnika u prozoru grupnog razgovora"
 
-#: ../src/common/config.py:202
-msgid "Merge consecutive nickname in chat window"
-msgstr "Spajanje toka po nadimcima u prozoru razgovora"
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
 
-#: ../src/common/config.py:203
-msgid "Indentation when using merge consecutive nickame"
+#: ../src/common/config.py:219
+#, fuzzy
+msgid "Indentation when using merge consecutive nickame."
 msgstr "Uvlačenje pri korištenju spajanja toka po nadimcima"
 
-#: ../src/common/config.py:204
-msgid "List of colors that will be used to color nicknames in groupchats"
-msgstr "Lista boja koje će biti korištene za bojanje nadimaka u grupnim razgovorima"
+#: ../src/common/config.py:220
+#, fuzzy
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+"Lista boja koje će biti korištene za bojanje nadimaka u grupnim razgovorima"
+
+#: ../src/common/config.py:221
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
+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:263
 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 "Ako je označeno, Gajim če koristiti vašu IP adresu i proxy koji je definiran u file_transfer_proxies opcijama za prijenos."
+#: ../src/common/config.py:267
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Ako je označeno, Gajim če koristiti vašu IP adresu i proxy koji je definiran "
+"u file_transfer_proxies opcijama za prijenos."
+
+#: ../src/common/config.py:326
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP nije moguće koristiti na ovom računalu"
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:327 ../src/common/config.py:330
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:336
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:337
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Vraćam se ubrzo"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Vraćam se za nekoliko minuta."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite mi poruku."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Radim."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Vani"
 
-#: ../src/common/config.py:303
-msgid "I'm out enjoying life"
+#: ../src/common/config.py:357
+#, fuzzy
+msgid "I'm out enjoying life."
 msgstr "Vani uživam život"
 
-#: ../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 "Zvuk koji će biti pušten kad neka MUC poruka sadrži neku riječ iz muc_highlight_words, ili kad neka MUC poruka sadrži vaš nadimak."
+#: ../src/common/config.py:361
+#, fuzzy
+msgid "I'm available."
+msgstr "Dostupan"
 
-#: ../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 "Zvuk koji će biti pušten kad je primljena neka MUC poruka. (Ova postavka je postavljena samo ako je notify_on_all_muc_messages Istinito)"
+#: ../src/common/config.py:362
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Slobodan za razgovor"
+
+#: ../src/common/config.py:364
+#, fuzzy
+msgid "I'm not available."
+msgstr "Nedostupan"
+
+#: ../src/common/config.py:365
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:366 ../src/common/config.py:367
+msgid "Bye!"
+msgstr ""
 
-#: ../src/common/config.py:321
-#: ../src/common/optparser.py:185
+#: ../src/common/config.py:376
+#, fuzzy
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Zvuk koji će biti pušten kad neka MUC poruka sadrži neku riječ iz "
+"muc_highlight_words, ili kad neka MUC poruka sadrži vaš nadimak."
+
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
+msgstr ""
+
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:325
-#: ../src/common/optparser.py:171
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
+msgid "Unable to load idle module"
+msgstr "Nije moguće učitati modul idle"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
+#, fuzzy
+msgid "Wrong host"
+msgstr "Kriva Lozinka"
+
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
+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 "Registracijske informacije za transport %s nisu došle na vrijeme"
+
+#: ../src/common/connection_handlers.py:1519
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Nadimak nije pronađen: %s "
+
+#. password required to join
+#. we are banned
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
+msgstr "Nije moguće pridružiti se sobi"
+
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
+msgstr "Potrebna je lozinka za pridruživanje ovoj sobi."
+
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
+msgstr "Zabranjen vam je pristup ovoj sobi."
+
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
+msgstr "Takva soba ne postoji."
+
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
+msgstr "Stvaranje soba je ograničeno."
+
+#: ../src/common/connection_handlers.py:1594
+msgid "Your registered nickname must be used."
+msgstr "Morate koristiti vaš registrirani nadimak."
+
+#: ../src/common/connection_handlers.py:1597
+msgid "You are not in the members list."
+msgstr "Niste u listi članova."
+
+#: ../src/common/connection_handlers.py:1605
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Vaš željeni nadimak se trenutno koristi ili je registriran od strane nekog "
+"od učesnika.\n"
+"Molimo niže odredite drugi nadimak:"
+
+#: ../src/common/connection_handlers.py:1651
+msgid "I would like to add you to my roster."
+msgstr "Želio bih te dodati na moju listu kontakata."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1672
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "sada smo pretplaćeni na %s"
+
+#: ../src/common/connection_handlers.py:1674
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Zahtjev za ukidanjem pretplate od %s"
+
+#: ../src/common/connection_handlers.py:1676
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "sada smo ukinuli pretplatu za %s"
+
+#: ../src/common/connection_handlers.py:1846
+#, 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 ne poštuje RFC pravila. Neće biti dodan na vašu listu kontakata. "
+"Upotrijebite alate za upravljanje listom kontakata kao što je http://jru."
+"jabberstudio.org/ za uklanjanje"
+
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Veza sa računom \"%s\" je izgubljena"
 
-#: ../src/common/connection.py:173
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Ako želite nastaviti sa slanjem i primanjem poruka, morati će te se ponovno spojiti."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
+msgstr ""
 
-#: ../src/common/connection.py:185
-#: ../src/common/connection.py:211
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Prijenos %s je krivo odgovorio na poziv za registraciju."
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Nepravilan odgovor"
 
-#: ../src/common/connection.py:397
-#: ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nije moguća veza sa \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Povezan na poslužitelj %s:%s sa %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Provjerite vašu vezu ili pokušajte ponovno kasnije"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikacija sa \"%s\" nije uspjela"
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:456
 msgid "Please check your login and password for correctness."
 msgstr "Molimo vas da provjerite korisničko ime i lozinku za greške."
 
 #. We didn't set a passphrase
 #: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "Lozinka za OpenPGP nije unešena"
 
 #. %s is the account name here
 #: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Biti će te spojeni na %s bez OpenPGP-a."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "nevidljiv"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "odspojen"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "Ja sam %s"
 
 #. we're not english
-#: ../src/common/connection.py:699
-msgid "[This message is encrypted]"
+#. one  in locale and one en
+#: ../src/common/connection.py:708
+#, fuzzy
+msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Ova poruka je kriptirana]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4968,300 +6091,625 @@ msgstr ""
 "Tema: %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 "Želio bih te dodati na moju listu kontakata."
+#: ../src/common/connection.py:897
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
-msgid "Unable to load idle module"
-msgstr "Nije moguće učitati modul idle"
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:33
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Ovom računalu nedostaju D-Bus python poveznice"
 
-#: ../src/common/connection_handlers.py:581
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registracijske informacije za transport %s nisu došle na vrijeme"
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus mogućnosti Gajima ne mogu se koristiti"
 
-#. 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 "Nije moguće pridružiti se sobi"
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2 (poznat kao python-pysqlite2) nedostaje. Izlazim..."
 
-#: ../src/common/connection_handlers.py:1451
-msgid "A password is required to join this room."
-msgstr "Potrebna je lozinka za pridruživanje ovoj sobi."
+#: ../src/common/exceptions.py:30
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Servis nije dostupan: Gajim nije pokrenut ili je remote_control Neistinito"
 
-#: ../src/common/connection_handlers.py:1454
-msgid "You are banned from this room."
-msgstr "Zabranjen vam je pristup ovoj sobi."
+#: ../src/common/exceptions.py:38
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus nije namješten na ovom sustavu ili nema python modula."
 
-#: ../src/common/connection_handlers.py:1457
-msgid "Such room does not exist."
-msgstr "Takva soba ne postoji."
+#: ../src/common/exceptions.py:46
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Sesijska sabirnica nije dostupna.\n"
+"Pokušajte pročitati http:/trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/connection_handlers.py:1460
-msgid "Room creation is restricted."
-msgstr "Stvaranje soba je ograničeno."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Ništa"
 
-#: ../src/common/connection_handlers.py:1463
-msgid "Your registered nickname must be used."
-msgstr "Morate koristiti vaš registrirani nadimak."
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "tko"
 
-#: ../src/common/connection_handlers.py:1466
-msgid "You are not in the members list."
-msgstr "Niste u listi članova."
+#: ../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 "za"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "datoteka"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
 msgstr ""
-"Vaš željeni nadimak se trenutno koristi ili je registriran od strane nekog od učesnika.\n"
-"Molimo niže odredite drugi nadimak:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "sada smo pretplaćeni na %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Događaj"
 
-#: ../src/common/connection_handlers.py:1521
-msgid "unsubscribe request from %s"
-msgstr "Zahtjev za ukidanjem pretplate 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 "sada smo ukinuli pretplatu za %s"
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Nastaviti"
 
-#: ../src/common/connection_handlers.py:1680
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Obriši"
+
+#: ../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 ne poštuje RFC pravila. Neće biti dodan na vašu listu kontakata. Upotrijebite alate za upravljanje listom kontakata kao što je http://jru.jabberstudio.org/ za uklanjanje"
+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/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 "Registrirati se 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 "Radim."
+
+#: ../src/common/fuzzyclock.py:62
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Noon"
+msgstr "Ništa"
+
+#: ../src/common/fuzzyclock.py:63
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:63
+#, fuzzy
+msgid "Evening"
+msgstr "Događaj"
+
+#: ../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:105
 msgid "Invalid character in username."
 msgstr "Neispravan znak u korisničkom imenu."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Potrebna je adresa poslužitelja."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Neispravan znak u imenu računala."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Neispravan znak u resursu."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Zaposlen"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Zaposlen"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "Nedostupan"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Dostupan"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Povezujem"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Odsutan"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Odspojen"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Odspojen"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Ima greške"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "?Pretplata koju već imamo:Ništa"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za Pretplatu):Ništa"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Sudionici"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Sudionik"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Posjetitelj"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:301
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
+
+#: ../src/common/helpers.py:303
+#, fuzzy
+msgid "Owner"
+msgstr "_Vlasnik"
+
+#: ../src/common/helpers.py:305
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrator"
+
+#: ../src/common/helpers.py:307
+#, fuzzy
+msgid "Member"
+msgstr "_Član"
+
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "obraća pažnju na razgovor"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:350
 msgid "is composing a message..."
 msgstr "piše poruku..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "stanka pri pisanju poruke"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor za razgovor"
 
+#: ../src/common/helpers.py:880
+#, python-format
+msgid " %d unread message"
+msgid_plural " %d unread messages"
+msgstr[0] "%d nepročitana poruka"
+msgstr[1] "%d nepročitanih poruka"
+
+#: ../src/common/helpers.py:886
+#, python-format
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
+msgstr[0] "%d nepročitana jedna poruka"
+msgstr[1] "%d nepročitanih jednih poruka"
+
+#: ../src/common/helpers.py:892
+#, python-format
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
+msgstr[0] "%d nepročitana poruka grupnih razgovora"
+msgstr[1] "%d nepročitanih poruka grupnih razgovora"
+
+#: ../src/common/helpers.py:898
+#, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] "Gajim - %d nepročitana privatna poruka"
+msgstr[1] "%d nepročitanih privatnih poruka"
+
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
+#, 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 "greška: nemogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:180
-#: ../src/common/optparser.py:181
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "cijan"
 
+#: ../src/common/optparser.py:302
+#, fuzzy
+msgid "migrating logs database to indeces"
+msgstr "kreiram bazu zabilješki"
+
+#: ../src/common/passwords.py:86
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "računa %s"
+
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Vezu nije moguće ostvariti."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Ako želite nastaviti sa slanjem i primanjem poruka, morati će te se ponovno "
+"spojiti."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:218
+msgid "Please check if Avahi is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Nemogu učitati sliku"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Nemoguće vezanje na port %s."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:324
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Nije moguća veza sa \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:353
+msgid "[This message is encrypted]"
+msgstr "[Ova poruka je kriptirana]"
+
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "greška prilikom slanja %s ( %s )"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Away "
+#~ msgstr "Odsutan"
+
+#~ msgid "Down"
+#~ msgstr "Skidanje"
+
+#~ msgid "List of special notifications settings"
+#~ msgstr "Lista podešenja posebnih obavijesti"
+
+#~ msgid "Not Available "
+#~ msgstr "Nedostupan"
+
+#~ msgid "Up"
+#~ msgstr "Gore"
+
+#~ msgid "Create your own Privacy Lists"
+#~ msgstr "Sami stvorite svoju vlasitu Listu Privatnosti"
+
+#~ msgid "Server-based Privacy Lists"
+#~ msgstr "Liste Privatnosti ovisne o poslužitelju"
+
+#~ msgid "Contact _Info"
+#~ msgstr "Kontakt _Info"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informacije Kontakta"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Invalid room or server name"
+#~ msgstr "Neispravno ime sobe ili poslužitelja"
+
+#~ msgid "Unknown D-Bus version: %s"
+#~ msgstr "Nepoznata verzija D-Busa: %s"
+
+#~ msgid "vCard publication succeeded"
+#~ msgstr "Objava vCard uspješna"
+
+#~ msgid "Your personal information has been published successfully."
+#~ msgstr "Vaši osobni podaci su uspješno objavljeni."
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Selim Zapise..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Pričekajte dok se odvija selidba zapisa..."
+
+#~ msgid "_Join New Room"
+#~ msgstr "_Pridruživanje Novoj Sobi"
+
+#~ msgid "Gajim - %d unread message"
+#~ msgid_plural "Gajim - %d unread messages"
+#~ msgstr[0] "Gajim - %d nepročitana poruka"
+#~ msgstr[1] "Gajim - %d nepročitanih poruka"
+#~ msgstr[2] ""
+
+#~ msgid "Role: "
+#~ msgstr "Uloga: "
+
+#~ msgid "Since %s"
+#~ msgstr "Od %s"
+
+#~ msgid "Merge consecutive nickname in chat window"
+#~ msgstr "Spajanje toka po nadimcima u prozoru razgovora"
+
+#~ 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 ""
+#~ "Zvuk koji će biti pušten kad je primljena neka MUC poruka. (Ova postavka "
+#~ "je postavljena samo ako je notify_on_all_muc_messages Istinito)"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automatski autoriziraj kontakt"
+
 #~ msgid "Send File"
 #~ msgstr "Pošalji Datoteku"
+
 #~ msgid "Underline"
 #~ msgstr "Podcrtano"
-
-
diff --git a/po/it.po b/po/it.po
index b4b4b91c9..602ad464e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-04-28 14:06+0300\n"
 "Last-Translator: Matteo Dell'Amico <della@linux.it>\n"
 "Language-Team: Italian\n"
@@ -44,22 +44,26 @@ msgid "_Discover Services..."
 msgstr "_Ricerca servizi..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "Chat di _gruppo"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modifica account..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Apri composizione email"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stato"
@@ -245,16 +249,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Generale"
 
@@ -317,17 +323,17 @@ msgid "Manage..."
 msgstr "Gestisci..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Nessuno"
 
@@ -615,11 +621,11 @@ msgstr "Editor di configurazione avanzata"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Stato: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Assente"
 
@@ -637,7 +643,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Invisibile"
 
@@ -647,21 +653,25 @@ msgid "Launch a command"
 msgstr "Comando inesistente: /%s"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Non disponibile"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Libero per chat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "Riproduci _suoni"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -674,16 +684,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -743,7 +750,7 @@ msgid "for "
 msgstr "Porta: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -777,7 +784,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Aggiungi ai contatti"
 
@@ -800,7 +807,7 @@ msgstr "_Apri il collegamento nel browser"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Inizia chat"
 
@@ -809,7 +816,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Invia _file"
@@ -826,12 +833,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Cronologia"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "Nel gruppo"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Configurazione della stanza"
 
@@ -918,11 +930,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Colori della scheda di stato chat</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Account\n"
 "Gruppo\n"
@@ -973,7 +986,7 @@ msgstr ""
 "Messaggi diretti\n"
 "a MUC"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "In pausa"
 
@@ -1114,14 +1127,14 @@ msgstr "Nega"
 msgid "Invitation Received"
 msgstr "Invito ricevuto"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Nickname:"
 
@@ -1139,8 +1152,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Entra"
 
@@ -1191,7 +1204,7 @@ msgstr "Gestisci profili proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1207,14 +1220,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Azioni"
 
@@ -1313,10 +1326,12 @@ msgid "Auto _not available after:"
 msgstr "N_on disponibile automaticamente dopo:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Ricerca in automatico ad ogni avvio di Gajim\n"
@@ -1324,18 +1339,14 @@ msgstr ""
 "Usa sempre le applicazioni predefinite di KDE\n"
 "Personalizza"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "_Prima del nickname:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Chat"
 
-#: ../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:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1347,39 +1358,59 @@ msgstr ""
 "da chi non è membro della lista contatti."
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Messaggio di stato"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "_Icone stato predefinite:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostra i _messaggi di stato dei contatti nella lista"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Noti_fiche dello stato di chat"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "_Ogni 5 minuti"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Emoticon:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Eventi"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim può ricevere ed inviare meta-informazioni relative ad una "
+"conversazione con un contatto. Qui è possibile specificare che stati di chat "
+"si vogliono inviare al corrispondente."
+
+#: ../data/glade/preferences_window.glade.h:43
 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 "
@@ -1389,14 +1420,14 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono inviare al corrispondente."
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:44
 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:42
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1404,7 +1435,7 @@ msgstr ""
 "Gajim notificherà i nuovi eventi tramite popup nell'angolo in fondo a destra "
 "dello schermo"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1412,7 +1443,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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1420,18 +1451,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:45
+#: ../data/glade/preferences_window.glade.h:48
 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1439,7 +1470,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1447,7 +1478,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:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1455,7 +1486,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1465,7 +1496,7 @@ msgstr ""
 "(es., un contatto MSN avrà l'icona MSN equivalente per gli stati online, "
 "assente, occupato, ecc...)"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1473,11 +1504,15 @@ msgstr ""
 "Se marcato, Gajim sostituirà gli smiley ASCII come ':)' con gli equivalenti "
 "emoticon grafici animati o statici"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "_Gestisci..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1489,84 +1524,95 @@ msgstr ""
 "Per account\n"
 "Per tipo"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Notificare i contatti che eseguono:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Notifica le nuove e-mail su _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "In _tutti i messaggi"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "Una finestra messaggi:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Noti_fiche dello stato di chat"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Riproduci _suoni"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Stampa ora:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Mostra solo nella lista _contatti"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Il messaggio di stato per l'assenza automatica"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Il messaggio di stato per il 'non disponibile' automatico"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Usa le icone dei _trasporti"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Usa _icona nell'area di notifica"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1578,96 +1624,102 @@ 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:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Quando si riceve un nuovo evento"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Editor di configurazione avanzata"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_Dopo l'ora:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "_Prima dell'ora:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "Gestore _file:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Carattere:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "Evidenzia _parole scorrette"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "Messaggio in _arrivo:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Client mail:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Mai"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Notifica"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "Messaggio in _uscita:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Riproduttore:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Mostra"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "_Reimposta ai colori di default"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "_Ordina i contatti per stato"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minuti"
 
@@ -1698,7 +1750,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "_Connetti all'avvio di Gajim"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1716,7 +1768,7 @@ msgstr "ID Jabber: "
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "Lista utenti bloccati"
@@ -1785,116 +1837,116 @@ msgid "City:"
 msgstr "Città:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Società:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Paese:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Dipartimento:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Indirizzo extra:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Nome:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Homepage:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Secondo nome:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Ancora"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Informazioni personali"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefono:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Titolo:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Codice postale:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Prefisso:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Ruolo:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Regione:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Via:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Suffisso:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Lavoro"
 
@@ -1935,47 +1987,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Modifica _gruppi"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Invia _messaggio singolo"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Inizia _chat"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Permetti di vedere il mio stato"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Proibisci di vedere il mio stato"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Elimina dai contatti"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Abbonamento"
 
@@ -2021,8 +2080,8 @@ msgstr "_Contenuti"
 msgid "_Discover Services"
 msgstr "_Ricerca servizi"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Modifica"
 
@@ -2112,36 +2171,42 @@ msgid "_Send & Close"
 msgstr "_Invia e Chiudi"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Autorizza"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Richiesta di abbonamento"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Autorizza"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Nega"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Suoni Wav"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Mostra tutti gli _eventi pendenti"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Mostra lista _contatti"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_to"
 
@@ -2154,38 +2219,43 @@ msgstr "Chiedi:"
 msgid "Client:"
 msgstr "Client:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Commento: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Contatti"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "ID Jabber: "
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Risorsa:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stato:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Abbonamento:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Memorizza cronologia conversazione"
@@ -2379,7 +2449,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2408,50 +2478,50 @@ msgstr "Nessuna connessione disponibile"
 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:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Chat"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Cifratura attivata"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Cifratura disattivata"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Non nei contatti"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2459,276 +2529,281 @@ msgstr ""
 "Se questa scheda viene chiusa e la cronologia è disabilitata, questo "
 "messaggio verrà perso."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Ogni %s _minuti"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Primo messaggio ricevuto"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Contatto connesso"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Messaggio inviato"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Evidenziatura messaggi in chat di gruppo"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in chat di gruppo"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Invito ricevuto"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Eventi non letti"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 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:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 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:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Torno subito."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Effettuare un nuovo login?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 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:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Scelta chiave OpenPGP"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Non ci sono account attivi"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2736,11 +2811,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2748,11 +2823,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2760,11 +2835,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2772,7 +2847,7 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2789,90 +2864,100 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Elimina"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Stampa ora:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat di gruppo"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "È necessario inserire una password per il nuovo account."
 
-#: ../src/config.py:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
-#: ../src/config.py:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID duplicato"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Questo account è già configurato in Gajim."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2881,23 +2966,23 @@ msgstr ""
 "\", o farlo più tardi cliccando alla voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2905,255 +2990,264 @@ 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:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "%i giorni fa"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome contatto: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "Nel gruppo"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Nome contatto"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "Messaggio di stato %s"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Salva come messaggio di stato preimpostato"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Inserire un nome per questo messaggio di stato"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Indirizzo:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Indirizzo:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Indirizzo extra:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Trasporti"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente deve non contenere una risorsa."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Contatto già presente nella lista"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Questo contatto è già presente nella lista."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "Un client jabber GTK+"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "GRAZIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 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:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Non è possibile entrare nella stanza"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Richiesta di abbonamento per l'account %s da %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Sei già nella stanza %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Il nome della stanza o del server contiene caratteri non permessi."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Nasconde l'intestazione in una finestra di chat di gruppo"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3163,259 +3257,269 @@ msgstr ""
 "mandare un messaggio di chat:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossibile scrivere il file in %s"
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Invito a chat di gruppo"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contatto disconnesso"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Descrizione: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato di una linea</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato di una linea</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Chat private"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Nome utente non valido"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "È necessario inserire una password per il nuovo account."
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s ti ha invitato alla stanza %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s diventa:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Creazione notifica speciale per %s"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Connessione"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Altri"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Conferenze"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca servizi usando l'account %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Ricerca servizi"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3423,51 +3527,69 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controllare "
 "l'indirizzo e riprovare."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Sfoglia %s usando l'account %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Consulta"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Analisi %d / %d..."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Utenti"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Descrizione"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Abbonati"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "A_bbonati"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "A_bbonati"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "File"
@@ -3493,7 +3615,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Tu"
 
@@ -3503,7 +3625,7 @@ msgid "Sender: %s"
 msgstr "Mittente: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Destinatario: "
 
@@ -3570,31 +3692,31 @@ msgstr "Descrizione: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vuole inviarti un file:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Cosa fare?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3630,12 +3752,11 @@ msgstr "File: "
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare file vuoti"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Mittente: "
 
@@ -3643,32 +3764,32 @@ msgstr "Mittente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim ha bisogno di un server X per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim ha bisogno di PyGTK 2.6 o superiore"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim ha bisogno di GTK2.6 o superiore"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Supporto libglade mancante nel runtime GTK+"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3677,21 +3798,21 @@ msgstr ""
 "Eliminare il runtime GTK+ corrente ed installare l'ultima versione stabile "
 "da %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 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
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3699,86 +3820,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Connessione"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Oggetto: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "errore durante l'invio di %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, 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
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Lo vedrai sempre come offline."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gajim.py:748 ../src/common/connection.py:389
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s è ora %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Si è connessi senza la chiave OpenPGP"
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nuova e-mail su %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3788,56 +3909,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Nessuna connessione disponibile"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
 
@@ -3860,7 +3986,8 @@ msgid "Shows or hides the roster window"
 msgstr "Mostra o nascondi la lista contatti"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Apre una finestra con il prossimo messaggio non letto"
 
 #: ../src/gajim-remote.py:82
@@ -4192,8 +4319,8 @@ msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Non sei più nella stanza \"%s\" o \"%s\" è uscito."
 
 #: ../src/groupchat_control.py:141
@@ -4210,98 +4337,99 @@ msgid "Insert Nickname"
 msgstr "Cambia _nickname"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bandito: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s è ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "Nel gruppo"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s è ora %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Questa stanza non ha oggetto"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s non sembra essere un JID valido"
 
-#: ../src/groupchat_control.py:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandi: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Uso: /%s <nickname|JID> [motivo], bandisce il JID dalla stanza. Il nickname "
 "di un partecipante può venire usato al posto del JID, ma non se contiene \"@"
 "\". Se il JID è correntemente nella stanza, verrà anche cacciato. NON "
 "supporta la presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4309,12 +4437,12 @@ msgstr ""
 "Uso: /%s <nickname>, apre una finestra di chat privata al partecipante "
 "specificato."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, pulisce la finestra di testo."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4323,21 +4451,21 @@ msgstr ""
 "Uso: /%s [motivo], chiude la finestra oi scheda corrente, mostrando il "
 "motivo se specificato."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, nasconde i pulsanti di chat."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Uso: /%s <JID> [motivo], invita JID alla stanza corrente, opzionalmente "
 "fornendo un motivo."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4346,27 +4474,27 @@ msgstr ""
 "Uso: /%s <stanza>@<server>[/nickname], offre la possibilità di entrare in "
 "stanza@server, opzionalmente usando il nickname specificato."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 msgstr ""
 "Uso: /%s <nickname> [motivo], rimuove il partecipante specificato per "
 "nickname dalla stanza e opzionalmente mostra un motivo. NON supporta la "
 "presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "Uso: /%s <azione>, invia l'azione alla stanza corrente. Usare la terza "
 "persona (esempio: /%s esplode)."
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4375,95 +4503,97 @@ msgstr ""
 "Uso: /%s <nickname> [messaggio], apre una finestra di messaggi privati ed "
 "invia il messaggio al partecipante specificato per nickname."
 
-#: ../src/groupchat_control.py:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr ""
 "Uso: /%s [argomento], mostra o aggiorna l'argomento della stanza corrente."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Uso: /%s [argomento], mostra o aggiorna l'argomento della stanza corrente."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, 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:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Non esiste aiuto per /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Si è sicuri di voler uscire dalla stanza \"%s\"?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Chiudendo questa finestra, si verrà disconnessi da questa stanza."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Non chiederlo più"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Specificare il nuovo nickname da usare:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Segnalibro già impostato"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "La stanza \"%s\" è già tra i segnalibri."
 
-#: ../src/groupchat_control.py:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Il segnalibro è stato aggiunto con successo"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
@@ -4494,76 +4624,76 @@ msgstr "Dettagli"
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 #, fuzzy
 msgid "Extension not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salva file come..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Impossibile trovare la base dati delle cronologie"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Contatti"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Nickname"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Messaggio"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Oggetto"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 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:184
+#: ../src/history_manager.py:188
 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 "
@@ -4577,16 +4707,16 @@ msgstr ""
 "\n"
 "Nel caso si prema SÌ, attendere..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Esportazione cronologie..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, 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:510
+#: ../src/history_manager.py:514
 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] ""
@@ -4594,11 +4724,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Si vuole davvero eliminare la cronologia per i contatti selezionati?"
 
-#: ../src/history_manager.py:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Questa operazione è irreversibile."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 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?"
@@ -4629,11 +4759,11 @@ msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Messaggi"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4673,46 +4803,46 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nuovo messaggio da %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Invito ricevuto"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4720,86 +4850,87 @@ msgstr ""
 "C'è stato un errore nella pubblicazione delle informazioni personali, "
 "riprovare più tardi."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Osservatori"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "usando l'account %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "all'account %s"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "usando l'account %s"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "dell'account %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Gestione segnalibri..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Gestore cronologia"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Entrare in chat di gruppo"
 
-#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
-#: ../src/roster_window.py:3027
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, 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
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4807,12 +4938,12 @@ msgstr ""
 "Non sarai in grado di mandare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4821,72 +4952,122 @@ msgstr ""
 "Non sarai in grado di mandare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Contatti"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Inserire la passphrase della chiave GPG per l'account %s."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Rinomina"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Inserire la passphrase della chiave GPG per l'account %s."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Elimina"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Elimina il contatto dalla lista"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Nuova stanza"
+msgid "_New group chat"
+msgstr "Chat di gruppo"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Vorrei aggiungerti ai miei contatti"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Invia nuovo messaggio"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Ri_nomina"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "Utenti _online"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Connetti"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "L'autorizzazione è stata inviata"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4894,7 +5075,7 @@ msgstr ""
 "Eliminando questo contatto ne verrà rimossa anche l'autorizzazione. Questi "
 "ti vedrà sempre offline."
 
-#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4902,17 +5083,17 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Voglio che questo contatto conosca il mio stato dopo la rimozione"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4921,32 +5102,32 @@ msgstr ""
 "Eliminando questo contatto ne verrà rimossa anche l'autorizzazione. Questi "
 "ti vedrà sempre offline."
 
-#: ../src/roster_window.py:2411
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, 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:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Memorizza passphrase"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Passphrase errata"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Si può selezionare <"
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Stai partecipando ad una o più chat di gruppo"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4954,21 +5135,21 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4976,111 +5157,135 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"È necessario creare un account prima di poter chattare con altri contatti."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Sposta %s nel gruppo %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Rendere %s e %s metacontatti"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Cambia messaggio di stato..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Ruolo: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Nascondi questo menu"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Affiliazione: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "ID Jabber: "
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Risorsa: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Ultimo stato su %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "da %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "ID Jabber: "
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Abbonamento: "
+
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Scarica"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Invia"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Trasferito: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Non iniziato"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Fermato"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Completato"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "In stallo"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5088,25 +5293,25 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "da %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Affiliazione: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5114,7 +5319,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5122,14 +5327,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5137,122 +5342,122 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "creazione database log"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s è un file ma dovrebbe essere una cartella"
 
-#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim sta per uscire"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s è una cartella ma dovrebbe essere un file"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "creazione della cartella %s"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, 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:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Assente per inattività"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Non disponibile per inattività"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Si può selezionare <"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Aggiungere * e [n] al titolo della lista contatti?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5260,12 +5465,12 @@ msgstr ""
 "Quante linee ricordare dalla precedente conversazione quando una scheda/"
 "finestra di chat viene riaperta."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5273,11 +5478,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:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quante linee memorizzare per Ctrl+Alto."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5286,38 +5491,59 @@ msgstr ""
 "URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
 "che significa usare wiktionary."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:153
 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:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 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:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 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:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 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:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5325,32 +5551,36 @@ msgstr ""
 "Imposta l'host inviato per il trasferimento file in caso di traduzione di "
 "indirizzo/port forwarding."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 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:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Mostrare scheda quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrare bordo per le schede quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
 "chat multi-utente."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5359,11 +5589,11 @@ msgstr ""
 "cliccato. Questa impostazione è presa in considerazione solo se viene usata "
 "l'icona nello spazio di notifica."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:191
 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:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5371,7 +5601,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà un icona su ogni scheda contenente messaggi non "
 "letti. A seconda del tema, questa icona può essere animata."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5380,7 +5610,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà il messaggio di stato, se non vuoto, per ogni "
 "contatto sotto il nome del contatto nella finestra dei contatti"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5388,7 +5618,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:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5397,29 +5627,37 @@ 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:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5429,18 +5667,19 @@ msgstr ""
 "finestra lampeggia (comportamento predefinito per la maggior parte dei "
 "gestori di finestre) quando contiene nuovi eventi."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5460,68 +5699,83 @@ msgstr ""
 "ad una specifica finestra. Nota, cambiare questa opzione richiede il riavvio "
 "di Gajim prima che le modifiche abbiano effetto"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 #, 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:206
+#: ../src/common/config.py:212
 #, 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:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Nasconde i pulsanti nella finestra di chat di gruppo"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, 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:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Nasconde l'intestazione in una finestra di chat di gruppo"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Nasconde l'intestazione nella finestra di chat a due persone"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Nasconde la lista dei presenti nella stanza nella finestra di chat di gruppo"
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Workaround Jabberd2"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5529,150 +5783,147 @@ 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:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Di ritorno tra qualche minuto."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Mangio"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Sto mangiando, lascia pure un messaggio"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Lavoro"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Sono al telefono"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Fuori"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Sono fuori a divertirmi"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponibile"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Libero per chat"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Servizio non disponibile"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 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: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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "marino"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Passphrase errata"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5685,49 +5936,54 @@ msgstr ""
 "Le informazioni di registrazione per il transport %s non sono arrivate in "
 "tempo"
 
-#: ../src/common/connection_handlers.py:1449
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Non è possibile entrare nella stanza"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "È necessaria una password per entrare in questa stanza."
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Sei bandito da questa stanza."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Questa stanza non esiste."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "Non è permessa la creazione di stanze."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "È necessario usare il nickname registrato."
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Non appartieni alla lista dei membri."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5735,27 +5991,27 @@ msgstr ""
 "Il nickname desiderato è in uso o registrato da un altro partecipante.\n"
 "Specificare un altro nickname sotto:"
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "si è ora abbonati a %s"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "richiesta di cancellazione abbonamento da %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "è stato ora cancellato l'abbonamento a %s"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5765,91 +6021,89 @@ msgstr ""
 "strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
 "rimuoverlo"
 
-#: ../src/common/connection.py:162
-#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"Per continuare a mandare e ricevere messaggi, è necessario riconnettersi."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr ""
 "Il trasporto %s ha risposto in maniera errata alla richiesta di "
 "registrazione."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Risposta non valida"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Connesso al server %s:%s con %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Controllare la connessione o riprovare più tardi"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "Non è stata impostata la passphrase OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "invisibile"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "Sono %s"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5858,16 +6112,16 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "I binding python per D-Bus sono mancanti su questo computer"
 
-#: ../src/common/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Le potenzialità D-Bus di Gajim non possono essere usate"
 
@@ -6058,242 +6312,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Carattere non valido nel nome utente."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Indirizzo del server richiesto."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Carattere non valido nell'hostname."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Carattere non valido nella risorsa."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "O_ccupato"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Libero per chat"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Libero per chat"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Disponibile"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "_Assente"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Invisibile"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "Ci sono errori"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Da"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Entrambi"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Proprietario"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Amministratore"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Membro"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "sta facendo altro"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "si è fermato mentre scriveva un messaggio"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o scheda di chat"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6304,50 +6558,116 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "errore: impossibile aprire %s per lettura"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "creazione database log"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "con l'account %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "La connessione non può essere stabilita."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Per continuare a mandare e ricevere messaggi, è necessario riconnettersi."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, 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
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Non è possibile entrare nella stanza"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Non ci si è potuti collegare a \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Questo messaggio è cifrato]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "A_bbonati"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "errore durante l'invio di %s ( %s )"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Nuova stanza"
+
+#~ msgid "Role: "
+#~ msgstr "Ruolo: "
+
+#~ msgid "Affiliation: "
+#~ msgstr "Affiliazione: "
+
+#~ 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 ""
+#~ "Suono da riprodurre quando arriva un messaggio MUC (questa impostazione "
+#~ "ha valore solo se notify_on_all_muc_messages è Vero)."
 
 #, fuzzy
 #~ msgid "Add"
@@ -6369,10 +6689,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgid "Not Available "
 #~ msgstr "Non disponibile"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Elimina"
-
 #~ msgid "Contact _Info"
 #~ msgstr "_Informazioni contatto"
 
@@ -6403,9 +6719,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ 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"
@@ -6490,9 +6803,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "Se marcato, Gajim ha anche un'icona nell'area di notifica"
 
-#~ msgid "_Online Users"
-#~ msgstr "Utenti _online"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Inizia chat con il contatto"
@@ -6676,9 +6986,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgid "Send Authorization to"
 #~ msgstr "Invia autorizzazione a"
 
-#~ msgid "Send New Message"
-#~ msgstr "Invia nuovo messaggio"
-
 #~ msgid "Send _New Message"
 #~ msgstr "Invia _nuovo messaggio"
 
diff --git a/po/nb.po b/po/nb.po
index a9d4f570d..114e885f5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-04-26 00:29+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -42,22 +42,26 @@ msgid "_Discover Services..."
 msgstr "_Oppdag Tjenester..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Gruppe Samtale"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Åpne ny Epost"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
@@ -243,16 +247,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Generelle"
 
@@ -314,17 +320,17 @@ msgid "Manage..."
 msgstr "Behandle..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ingen"
 
@@ -612,11 +618,11 @@ msgstr "Avansert Konfigurasjons Editor"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Status: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Borte"
 
@@ -634,7 +640,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -644,21 +650,25 @@ msgid "Launch a command"
 msgstr "kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Ledig for Prat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -671,16 +681,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -740,7 +747,7 @@ msgid "for "
 msgstr "Port:"
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -774,7 +781,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
@@ -797,7 +804,7 @@ msgstr "_Åpne Link i Nettleser"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
@@ -806,7 +813,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Send _Fil"
@@ -823,12 +830,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historie"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "I gruppen"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Rom Instillinger"
 
@@ -913,11 +925,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Samtalestatus Fane Farger</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Konto\n"
 "Gruppe\n"
@@ -968,7 +981,7 @@ msgstr ""
 "MUC Sendte\n"
 "Meldinger"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Pauset"
 
@@ -1107,14 +1120,14 @@ msgstr "Nekt"
 msgid "Invitation Received"
 msgstr "Invitasjon motatt"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
@@ -1132,8 +1145,8 @@ msgstr "Nylig:"
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1184,7 +1197,7 @@ msgstr "Behandle Proxy Profiler"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Navn:"
 
@@ -1200,14 +1213,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Handlinger"
 
@@ -1307,10 +1320,12 @@ msgid "Auto _not available after:"
 msgstr "Auto _ikke tilgjengelig etter:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Autodetekter hver gang Gajim starter\n"
@@ -1318,18 +1333,14 @@ msgstr ""
 "Alltid bruk KDE standard applikasjoner\n"
 "Egendefinert"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "F_ør kallenavn:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Samtale"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "Samtale status opp_lysninger:"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1341,39 +1352,59 @@ msgstr ""
 "ikke er i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Status Melding"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "Standard status _ikonsamling:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Samtale status opp_lysninger:"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "H_vert 5 minutt"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Uttrykksikoner:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha "
+"med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
+"sende motparten."
+
+#: ../data/glade/preferences_window.glade.h:43
 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 "
@@ -1383,21 +1414,21 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:44
 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:42
+#: ../data/glade/preferences_window.glade.h:45
 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:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1405,7 +1436,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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1413,19 +1444,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:45
+#: ../data/glade/preferences_window.glade.h:48
 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1433,7 +1464,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1441,7 +1472,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:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1449,7 +1480,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1458,7 +1489,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:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1466,11 +1497,15 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1482,84 +1517,95 @@ msgstr ""
 "Per konto\n"
 "Per type"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Alarmer meg om kontakter som:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Alarmer meg on nye _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "På hver _melding"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "En melding _vindu:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Samtale status opp_lysninger:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Utskrifts tid:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Den automatiserte borte meldinen"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Den autmatiserte ikke tilgjengelig meldingen"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Bruk _transportenes ikoner"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1571,96 +1617,102 @@ 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:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Når en ny hendelse blir motatt"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_Etter tid:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "_Før tid:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Font:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "_Innkommende melding:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Aldri"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Gi meg beskjed om det"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "_Utgående melding:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Spiller:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Sprett opp"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "_Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minutter"
 
@@ -1691,7 +1743,7 @@ msgstr ""
 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
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1709,7 +1761,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "Listen over Utestengte"
@@ -1778,116 +1830,116 @@ msgid "City:"
 msgstr "By:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Bedrift:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Land:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Avdeling:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Ekstra Adresse:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Fornavn:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Hjemmeside:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Mellomnavn:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Mer"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Personlig Informasjon"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefon Nummer:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Plassering:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Post Kode:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Tittel:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Rolle:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Fylke:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Gate:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Suffix:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Jobb"
 
@@ -1928,47 +1980,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Send _Melding"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Forby han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Abonement"
 
@@ -2014,8 +2073,8 @@ msgstr "_Innhold"
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Rediger"
 
@@ -2105,34 +2164,40 @@ msgid "_Send & Close"
 msgstr "_Send & Lukk"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Godkjenn"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Abbonerings Forespørsel"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Godkjenn"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Wav Lyder"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
@@ -2145,38 +2210,43 @@ msgstr "Spør:"
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Kommentar: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Kontakter"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ressurs:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Abbonement:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
@@ -2370,7 +2440,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2399,49 +2469,49 @@ msgstr "Tilkobling ikke tilgjengelig"
 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:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "ikke i kontaktliste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2449,96 +2519,101 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Hvert %s _minutt"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Neste Melding Motatt"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Invitasjon motatt"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 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:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2546,175 +2621,175 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 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:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 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:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 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:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2722,11 +2797,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2734,11 +2809,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2746,11 +2821,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2758,7 +2833,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2774,88 +2849,98 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Slett"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Utskrifts tid:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Gruppe Samtale"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/config.py:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 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:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Duplikat Jabber ID"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Kontakten er allerede konfigurert i Gajim."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2864,23 +2949,23 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Det skjedde en feil ved oppretting av kontoen"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2888,254 +2973,263 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
 "i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens navn: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adresse:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adresse:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Ekstra Adresse:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abbnerings ønske for konto %s fra %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abbonerings ønske fra %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Du er allerede i rom %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Rom navnet eller server navnet inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3145,258 +3239,268 @@ msgstr ""
 "å sende en melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Tilbkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Kontakt Logget Av"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enslig Melding med konto %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enslig Melding med konto %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Private Samtaler"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Du må skrive inn et passord for den nye kontoen"
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s har invitert deg til %(room_jid)s rom"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Tilkobling"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3404,51 +3508,69 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Utforsk %s med %s kontoen"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanner %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Abbonér"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Abbonér"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Abbonér"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Fil"
@@ -3474,7 +3596,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Du"
 
@@ -3484,7 +3606,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Mottaker: "
 
@@ -3551,31 +3673,31 @@ msgstr "Beskrivelse: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3611,12 +3733,11 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Avsender: "
 
@@ -3624,31 +3745,31 @@ msgstr "Avsender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim trenger en Xserver for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim trenger PyGTK 2.6 eller høyere"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim trenger GTK 2.6 eller høyere"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3657,21 +3778,21 @@ msgstr ""
 "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
 "versjon fra %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 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
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3679,86 +3800,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autentisering for %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Tilkobling"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Tittel: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "feil ved sending %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abbonementet fra deg"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Du vil alltid se han eller henne som frakoblet."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s er nå %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny E-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3768,56 +3889,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine instillinger og valg"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Tilkobling ikke tilgjengelig"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
@@ -3841,7 +3967,8 @@ msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Aktiver nytt vindu med den neste uleste melingen"
 
 #: ../src/gajim-remote.py:82
@@ -4173,8 +4300,8 @@ msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Du er ikke lenger i rommet \"%s\" eller \"%s\" har dratt."
 
 #: ../src/groupchat_control.py:141
@@ -4191,100 +4318,101 @@ msgid "Insert Nickname"
 msgstr "Endre _Kallenavn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "I gruppen"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s er nå %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Dette rommet har ingen tittel"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, 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:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn|JID> [årsak], utviser JIDen fra rommet. "
 "Kallenavnet til en bruker kan bli brukt, men ikke dersom det inneholder \"@"
 "\". 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:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4292,12 +4420,12 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den "
 "spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4306,21 +4434,21 @@ msgstr ""
 "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
 "dersom spesifisert."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Bruk: /%s, gjemmer samtale knappene."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Bruksanvisning: /%s <JID> [årsak], inviterer JID til gjeldende rom, og viser "
 "en årsak dersom spesifisert."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4329,27 +4457,27 @@ msgstr ""
 "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
 "gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn> [årsak], fjerner brukeren spesifisert av "
 "kallenavn fra rommet og viser om spesifisert en årsak. Støtter ikke "
 "mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
 "tredje person. (f.eks. /%s eksploderer.)"
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4358,25 +4486,25 @@ msgstr ""
 "Bruk: /%s <kallenavn> [melding], åpner et privat meldingsvindu og sender "
 "meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende rom."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer gjeldende rom tittel."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer gjeldende rom tittel."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4384,69 +4512,71 @@ msgstr ""
 "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
 "kommandoer."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av rommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Dersom du lukker dette vinduet, så vil du bli koblet fra dette rommet."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Rommet \"%s\" er allerede i dine bokmerker."
 
-#: ../src/groupchat_control.py:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Utvis %s"
@@ -4477,73 +4607,73 @@ msgstr "Detaljer"
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Lagre Fil som..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Melding"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Tittel"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 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:184
+#: ../src/history_manager.py:188
 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 "
@@ -4557,26 +4687,26 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, 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:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 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?"
@@ -4607,11 +4737,11 @@ msgstr "Status er nå: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4651,46 +4781,46 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Invitasjon motatt"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4698,86 +4828,87 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observerere"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat 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
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "bruker kontoen %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Behandle Bokmerker..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
-#: ../src/roster_window.py:3027
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, 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
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4785,12 +4916,12 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
 "transporten."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4799,74 +4930,124 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
 "transporten."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Kontakter"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Gi Nytt Navn"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Fjern"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Fjerner kontakt fra kontaktlisten"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Nytt Rom"
+msgid "_New group chat"
+msgstr "Gruppe Samtale"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "_Send Server Melding"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "_Online Brukere"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Logg på"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4874,7 +5055,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:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4882,17 +5063,17 @@ 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:2334
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4901,32 +5082,32 @@ 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
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
 
-#: ../src/roster_window.py:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4934,20 +5115,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:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4955,111 +5136,134 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått."
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr "Du må lage en konto før du kan snakke med andre kontakter."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Tøm %s i samtalerom %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Rolle: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Tilhørighet: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Siste status på %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "siden %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Abbonement: "
+
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Komplett"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5067,25 +5271,25 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Tilhørighet: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5093,7 +5297,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5101,13 +5305,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5115,121 +5319,121 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s er en fil men skulle ha vært en katalog"
 
-#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s er en katalog men skulle vært en fil"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Bruk DBus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Borte på grunn av inaktivitet"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Ikke tilgjengelig på grunn av inaktivitet"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formatterings symboler."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5237,12 +5441,12 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5250,11 +5454,11 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5263,37 +5467,58 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:153
 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:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5301,30 +5526,34 @@ msgstr ""
 "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
 "adresse oversetting/port videresending."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis fane felt ved bare en aktiv samtale?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtale."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5332,11 +5561,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:187
+#: ../src/common/config.py:191
 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:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5344,7 +5573,7 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5353,7 +5582,7 @@ msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5361,7 +5590,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:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5370,29 +5599,37 @@ 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:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5402,18 +5639,19 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5432,67 +5670,82 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 #, 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:206
+#: ../src/common/config.py:212
 #, 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:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Gjemmer knappene i gruppe samtale vindu"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "Gjemmer knappene i to personers samtale vindu"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet"
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5500,151 +5753,148 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Tilgjengelig"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Ledig for Prat"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Ikke tilgjengelig"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 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: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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "marine"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Feil Passordsetning"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5655,49 +5905,54 @@ msgstr ""
 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
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "Et passord kreves for å bli med i dette samtalerommet."
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Du er uønsket i dette rommet."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Et slikt rom finnes ikke."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "Rom oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Ditt registrerte kallenavn må bli brukt. "
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Du er ikke medlems listen."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5706,27 +5961,27 @@ msgstr ""
 "samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abbonerer nå på %s"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abbonerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5736,88 +5991,87 @@ msgstr ""
 "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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../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:165
+msgid "Reconnect manually."
+msgstr ""
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Transporten %s svarte feil på registrerings forespørselen."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Tilkoblet til server %s:%s med %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "usynlig"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, 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
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5826,16 +6080,16 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 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
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 
@@ -6025,242 +6279,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Fra"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Abbonér"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Modererere"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Modererer"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Eier"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrator"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Medlem"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6271,50 +6525,115 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "lager logg database"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "for konto %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Tilkoblingen kan ikke opprettes."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+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/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, 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
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Abbonér"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "feil ved sending %s ( %s )"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Nytt Rom"
+
+#~ msgid "Role: "
+#~ msgstr "Rolle: "
+
+#~ msgid "Affiliation: "
+#~ msgstr "Tilhørighet: "
+
+#~ 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 ""
+#~ "Lyd som spilles når en ny MUC melding kommer. (Denne instillingen er kun "
+#~ "aktiv når notify_on_all_muc_messages er True)"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6336,10 +6655,6 @@ msgstr "[Denne meldingen er kryptert]"
 #~ msgid "Not Available "
 #~ msgstr "Ikke tilgjengelig"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Slett"
-
 #~ msgid "Contact _Info"
 #~ msgstr "Kontakt_Info"
 
@@ -6370,9 +6685,6 @@ msgstr "[Denne meldingen er kryptert]"
 #~ 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"
@@ -6458,9 +6770,6 @@ msgstr "[Denne meldingen er kryptert]"
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
 
-#~ msgid "_Online Users"
-#~ msgstr "_Online Brukere"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Start samtale med konto %s"
diff --git a/po/nl.po b/po/nl.po
index 0a6aae145..3563bb27f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2005-12-19 18:44+0100\n"
 "Last-Translator: Stéphan Kochen <stephan@kochen.nl>\n"
 "Language-Team: none\n"
@@ -47,22 +47,26 @@ msgid "_Discover Services..."
 msgstr "Ontdek Services..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Groupsgesprek"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Account Be_werken..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Open Email Samensteller"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
@@ -249,16 +253,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Algemeen"
 
@@ -318,17 +324,17 @@ msgid "Manage..."
 msgstr "Beheer..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Geen"
 
@@ -615,11 +621,11 @@ msgstr "Geavanceerde Configuratie Wijzigen"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Status: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Afwezig"
 
@@ -637,7 +643,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
@@ -647,21 +653,25 @@ msgid "Launch a command"
 msgstr "commando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Niet Beschikbaar"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Open voor Gesprek"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "Speel _geluiden af"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -674,16 +684,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -744,7 +751,7 @@ msgid "for "
 msgstr "Poort: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -781,7 +788,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Toevoegen aan Roster"
 
@@ -804,7 +811,7 @@ msgstr "_Open Link in Browser"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Start Gesprek"
 
@@ -813,7 +820,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "_Bestand Verzenden"
@@ -830,12 +837,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Geschiedenis"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "In de groep"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Ruimte Configuratie"
 
@@ -924,11 +936,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr ""
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Account\n"
 "Groep\n"
@@ -978,7 +991,7 @@ msgid ""
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Gepauzeerd"
 
@@ -1113,14 +1126,14 @@ msgstr "Weigeren"
 msgid "Invitation Received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Bijnaam:"
 
@@ -1138,8 +1151,8 @@ msgstr "Recent:"
 msgid "Room:"
 msgstr "Ruimte:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Binnengaan"
 
@@ -1192,7 +1205,7 @@ msgstr "Beheer Proxy Profielen"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Naam:"
 
@@ -1209,14 +1222,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Acties"
 
@@ -1319,10 +1332,12 @@ msgstr "Automatisch _niet beschikbaar na:"
 
 # deelnemen?
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Herken automatisch als Gajim opstart\n"
@@ -1330,19 +1345,15 @@ msgstr ""
 "Gebruik altijd standaard KDE toepassingen\n"
 "Aangepast"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 #, fuzzy
 msgid "B_efore nickname:"
 msgstr "Voor bijnaam:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Gesprek"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "Gesprekstoestands _mededelingen:"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1354,44 +1365,61 @@ msgstr ""
 "contacten niet op je rooster geblokkeerd"
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Statusbericht"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 #, fuzzy
 msgid "Default status _iconset:"
 msgstr "Standaard _status iconenset:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 #, 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:36
+#: ../data/glade/preferences_window.glade.h:37
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Statusberichten van contacten weergeven in het rooster"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Gesprekstoestands _mededelingen:"
+
+#: ../data/glade/preferences_window.glade.h:39
 #, fuzzy
 msgid "E_very 5 minutes"
 msgstr "Elke 5 _minuten"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Beheer Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Gebeurtenissen"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
+
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1399,7 +1427,7 @@ msgid ""
 "send to the other party."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:44
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -1407,7 +1435,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:42
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -1415,7 +1443,7 @@ msgid ""
 msgstr ""
 "Gajim zal nieuwe berichten mededelen m.b.v. een popup rechtsonder in beeld"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1423,7 +1451,7 @@ msgstr ""
 "Gajim zal contacten die zich aanmelden mededelen m.b.v. een popup "
 "rechtsonder in beeld"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1431,19 +1459,19 @@ msgstr ""
 "Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
 "in beeld"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:48
 #, 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -1452,7 +1480,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1461,7 +1489,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim statusberichten van contacten onder de "
 "contactnaam in het roostervenster laten zien."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1469,7 +1497,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1479,7 +1507,7 @@ msgstr ""
 "(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
 "status online, afwezig, bezig, enz...)"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:55
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -1488,12 +1516,16 @@ msgstr ""
 "Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
 "bijpassende grafische emoticons"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Beheer..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1501,86 +1533,97 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "Bij elk _bericht"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 #, fuzzy
 msgid "One message _window:"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Gesprekstoestands _mededelingen:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Speel _geluiden af"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Print tijd:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "_Inloggen"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "_Uitloggen"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "T_heme:"
 msgstr "Thema:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Het statusbericht voor automatische afwezigheid"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Het statusbericht voor automatisch niet beschikbaar"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Gebruik _transport iconensets"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 #, fuzzy
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Icoon in mededelingsgebied"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -1593,106 +1636,112 @@ 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:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Geavanceerde Configuratie Wijzigen"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 #, fuzzy
 msgid "_After time:"
 msgstr "Na tijdsstempel:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "_Before time:"
 msgstr "Voor tijdsstempel:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "_File manager:"
 msgstr "Bestandsbeheerder:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "_Font:"
 msgstr "Lettertype:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _markeren"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Binnenkomend bericht:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "Houdt status veranderingen van contacten bij in het logboek"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Nooit"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Stel mij ervan op de hoogte"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "_Open..."
 msgstr "Open..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Uitgaand bericht:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Speler:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Opduiken"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Herstel naar Standaard Kleuren"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Sort contacts by status"
 msgstr "Sorteer contacten op status"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Status message:"
 msgstr "Status bericht:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minuten"
 
@@ -1723,7 +1772,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "Automatisch _verbinding maken als Gajim opstart"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1741,7 +1790,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr ""
 
@@ -1809,116 +1858,116 @@ msgid "City:"
 msgstr "Stad:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Bedrijf:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Land:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Afdeling:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Extra Adres:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Voornaam:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Homepage:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Middelste naam:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Meer"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Persoonlijke Informatie"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefoonnummer:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Positie:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Postcode:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Voorvoegsel:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Rol:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Staat:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Straat:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Achtervoegsel:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Werk"
 
@@ -1960,47 +2009,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Wijzig _Groepen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Enkel _Bericht Verzenden"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Start _Gesprek"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, 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:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, 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:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Verwijder van Rooster"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Hernoem"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Abonnement"
 
@@ -2046,8 +2102,8 @@ msgstr "_Inhoud"
 msgid "_Discover Services"
 msgstr "Ontdek Services"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "Be_werken"
 
@@ -2137,36 +2193,42 @@ msgid "_Send & Close"
 msgstr "Ver_stuur & Sluit"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Toestemmen"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 msgid "Authorize contact so he can know when you're connected"
 msgstr ""
 "Geef contact toestemming mijn status op te halen, zodat hij weet wanneer ik "
 "online ben"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Abonneringsverzoek"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Toestemmen"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Weigeren"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Wav Geluiden"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Laat Alle Wachtende Gebeurtenissen Zien"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "_Rooster Weergeven"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
@@ -2179,38 +2241,43 @@ msgstr "Vraag:"
 msgid "Client:"
 msgstr "Client:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Commentaar: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "_Inhoud"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "Besturingssysteem:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Bron:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Abonnement:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "Gespreksgeschiedenis"
@@ -2404,7 +2471,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2433,52 +2500,52 @@ msgstr "Er is geen verbinding beschikbaar"
 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:834
+#: ../src/chat_control.py:839
 #, fuzzy
 msgid "Chats"
 msgstr "Gesprek"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(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:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Versleuteling ingeschakeld"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "niet in het rooster"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, 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:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2486,328 +2553,333 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Elke %s _minuten"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Actief"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "titel statusbericht"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "statusbericht"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Contactnaam"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contact is Ingelogd"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 #, fuzzy
 msgid "Message Sent"
 msgstr "_Bericht"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Uitnodiging Ontvangen"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 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:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 #, 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:1289
+#: ../src/config.py:1337
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 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:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 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:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 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:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2817,92 +2889,102 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Wis MOTD"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Print tijd:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: ../src/config.py:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
 
-#: ../src/config.py:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
 
-#: ../src/config.py:2963
+#: ../src/config.py:3040
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2910,23 +2992,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:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2934,258 +3016,268 @@ msgstr ""
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acties voor \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "\"%s\" ontbreekt in de URL van de Web Zoekmachine"
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagen geleden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contactnaam: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Groep"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "In de groep"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "SleutelID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Contactnaam"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusbericht"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Extra Adres:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporten"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Ongeldige Gebruikers ID"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "Gebruikers ID:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "Een GTK+ jabber client"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr "Stéphan Kochen <stephan@kochen.nl>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abonnerings aanvraag voor account %s van %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnering aangevraagd van %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek met account %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:1185
-msgid "The room Jabber ID has not allowed characters."
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr ""
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3195,260 +3287,270 @@ msgstr ""
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Contact is Uitgelogd"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nieuw Bericht"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nieuw Enkel Bericht"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr ""
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "XML Console"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Start Gesprek"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Ongeldige gebruikersnaam"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
+#: ../src/dialogs.py:2220
 #, fuzzy, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Verbinding"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Overigen"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Conferentie"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 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:494
+#: ../src/disco.py:497
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "De service kon niet worden gevonden"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3456,51 +3558,69 @@ msgstr ""
 "Er bestaat geen service op het opgegeven adres, of de service geeft geen "
 "antwoord. Controleer het adres en probeer nogmaals."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "De service kan niet worden doorbladerd"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "via account %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Onderzoeken %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Gebruikers"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Beschrijving"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Abonneren"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Abonneer"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Abonneer"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Bestand"
@@ -3526,7 +3646,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Jij"
 
@@ -3536,7 +3656,7 @@ msgid "Sender: %s"
 msgstr "Afzender: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
@@ -3603,32 +3723,32 @@ msgstr "Beschrijving: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s wil je een bestand sturen:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3664,12 +3784,11 @@ msgstr "Bestand: "
 msgid "It is not possible to send empty files"
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Afzender: "
 
@@ -3677,31 +3796,31 @@ msgstr "Afzender: "
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim vereist een Xserver en zal nu stoppen..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim vereist GTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Libglade ondersteuning ontbreekt in de GTK+ runtime"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3709,23 +3828,23 @@ msgid ""
 msgstr ""
 "Verwijder je GTK+ runtime en installeer de laatste stabiele versie van %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 #, 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
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vereist PySQLite2"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim vereist PySQLite2"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3733,86 +3852,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Verbinding"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, fuzzy, python-format
 msgid "error while sending %s ( %s )"
 msgstr "fout tijdens versturen"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Je zult hem altijd als offline zien."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s is nu %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3822,56 +3941,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Er is geen verbinding beschikbaar"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sessiebeheer ondersteuning is niet beschikbaar (gnome.ui module ontbreekt)"
@@ -3895,7 +4019,8 @@ msgid "Shows or hides the roster window"
 msgstr "Laat roostervenster zien of verbergt het"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Laat een venster opduiken met het volgende ongelezen bericht"
 
 #: ../src/gajim-remote.py:82
@@ -4240,8 +4365,8 @@ msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Je bent niet meer in ruimte \"%s\" of \"%s\" heeft de ruimte verlaten."
 
 #: ../src/groupchat_control.py:141
@@ -4259,99 +4384,100 @@ msgid "Insert Nickname"
 msgstr "Verander Bij_naam"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s is nu bekend als %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "In de groep"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s is nu %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Deze ruimte heeft geen onderwerp"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s blijkt geen geldige JID te zijn"
 
-#: ../src/groupchat_control.py:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Commando's: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Gebruik: /%s <bijnaam|JID> [reden], verbant de JID uit de ruimte. De bijnaam "
 "van een aanwezige gebruiker mag gebruikt worden, maar niet als deze een \"@"
 "\" 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:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4359,12 +4485,12 @@ msgstr ""
 "Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
 "gebruiker."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4373,21 +4499,21 @@ msgstr ""
 "Gebruik: /%s [reden], sluit de huidige tab of venster, en laat reden achter "
 "indien opgegeven."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Gebruik: /%s <JID> [reden], nodigt JID uit de huidige ruimte binnen te "
 "komen, met optioneel de opgegeven reden."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4396,27 +4522,27 @@ msgstr ""
 "Gebruik: /%s <ruimte>@<server>[/bijnaam], biedt aan ruimte@server binnen te "
 "gaan, optioneel met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 msgstr ""
 "Gebruik: /%s <bijnaam> [reden], verwijdert de gebruiker met de opgegeven "
 "bijnaam van de ruimte, optioneel met de opgegeven reden. Ondersteunt GEEN "
 "spaties in de bijnaam."
 
-#: ../src/groupchat_control.py:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
 "gebruiken. (bijv. /%s loopt...)"
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4425,97 +4551,99 @@ msgstr ""
 "Gebruik: /%s <bijnaam> [bericht], opent een privé gespreksvenster en stuurt "
 "bericht naar de gebruiker met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Gebruik: /%s <bijnaam>, verandert je bijnaam in de huidige ruimte."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr ""
 "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
 "onderwerp bij naar de opgegeven tekst."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
 "onderwerp bij naar de opgegeven tekst."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, 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:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Geen hulp beschikbaar voor /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Weet je zeker dat je de ruimte \"%s\" wilt verlaten?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Als je dit venster sluit zal de verbinding verbroken worden met deze ruimte."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Vraag mij dit niet nogmaals"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Bijnaam Veranderen"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Bladwijzer bestaat al"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Ruimte \"%s\" heeft al een bladwijzer."
 
-#: ../src/groupchat_control.py:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -4546,78 +4674,78 @@ msgstr "Details"
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Sla Bestand op als..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "logboek database wordt aangemaakt"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 #, fuzzy
 msgid "Contacts"
 msgstr "_Inhoud"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Datum:"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 #, fuzzy
 msgid "Nickname"
 msgstr "Bijnaam:"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "_Bericht"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 #, fuzzy
 msgid "Subject"
 msgstr "Onderwerp:"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:184
+#: ../src/history_manager.py:188
 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 "
@@ -4626,27 +4754,27 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Logboeken worden omgezet..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
@@ -4677,12 +4805,12 @@ msgstr "Status is nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 #, fuzzy
 msgid "Messages"
 msgstr "_Bericht"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
@@ -4722,47 +4850,47 @@ msgstr ""
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4770,88 +4898,89 @@ msgstr ""
 "Er trad een fout up bij het publiceren van je persoonlijke informatie, "
 "probeer het later nogmaals."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Je kunt een ruimte niet binnengaan terwijl je onzichtbaar bent"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "via account %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "aan %s account"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "via %s account"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Beheer Bladwijzers..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "voor account %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 #, fuzzy
 msgid "History Manager"
 msgstr "_Geschiedenis"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, 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
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:1262
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4859,12 +4988,12 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4873,72 +5002,122 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "_Inhoud"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Hernoem"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Verwijder"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Verwijdert contact van rooster"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Nieuwe Ruimte"
+msgid "_New group chat"
+msgstr "Groupsgesprek"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 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:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Ver_stuur Server Bericht"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Her_noem"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "_Online Gebruikers"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Log in"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "Log _uit"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Wijzig Statusbericht"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -4947,7 +5126,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:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4955,17 +5134,17 @@ 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:2334
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Ik wil dat deze contact mijn status blijf zien na verwijdering"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4974,33 +5153,33 @@ 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
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, 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:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Sla wachtwoord op"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -5009,22 +5188,22 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: ../src/roster_window.py:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -5032,111 +5211,136 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
+"contacten."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Van %s in ruimte %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Stuurt een bestand aan contact"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Wijzig Statusbericht..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Rol: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Verberg dit menu"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Aansluiting: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Bron: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Standaard _status iconenset:"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Abonnement: "
+
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Verzonden: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Afgerond"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Vastgelopen"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Verzenden"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Deze service heeft nog niet geantwoord met gedetaileerde informatie"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5144,25 +5348,25 @@ msgstr ""
 "Deze service kon niet antwoorde met gedetaileerde informatie.\n"
 "Het is waarschijnlijk veroudert of kapot"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Aansluiting: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5170,7 +5374,7 @@ msgstr ""
 "Deze contact is geïnteresseert in jou aanwezigheid, maar jij niet in zijn/"
 "haar aanwezigheid"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5178,135 +5382,135 @@ msgstr ""
 "Je bent geïnteresseert in de contact z'n aanwezigheid, maar hij/zij niet in "
 "jouw aanwezigheid"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 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:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " bron met prioriteit"
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "logboek database wordt aangemaakt"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s is een bestand, maar een map werd verwacht"
 
-#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim sluit nu af"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s is een map, maar een bestand werd verwacht"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "map %s wordt aangemaakt"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, 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:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Afwezig vanwege inactiviteit"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Niet beschikbaar vanwege inactiviteit"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Voeg * en [n] toe aan roster titel?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5314,12 +5518,12 @@ msgstr ""
 "Hoeveel regels te onthouden van het vorige gesprek zodra een gesprekstab of -"
 "venster heropend wordt."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5327,11 +5531,11 @@ msgstr ""
 "Stuur bericht na Ctrl+Enter en slechts Enter maakt een nieuwe regel "
 "(Standaard gedrag van Mirabilis ICQ)."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hoeveel regels op te slaan voor Ctrl+Omhoog"
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5340,38 +5544,57 @@ 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:151
+#: ../src/common/config.py:153
 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:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:160
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5379,32 +5602,36 @@ msgstr ""
 "Forceert de host die opgegeven wordt voor bestandsoverdrachten in het geval "
 "van een NAT of port forwarding."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 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:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Laat tabs zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Laat tab rand zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Laat sluit knop zien in tabs?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die oplichten in een "
 "groepsgesprek"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5412,11 +5639,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:187
+#: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Indien Aan registreerd Gajim xmpp:// bij elke start."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5424,7 +5651,7 @@ msgstr ""
 "Indien Aan zal Gajim een icoon op elke tab weergeven met ongelezen "
 "berichten. Afhankelijk van het thema kan dit icoon geanimeerd zijn."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5433,7 +5660,7 @@ msgstr ""
 "Indien Aan zal Gajim het statusbericht van contacten weergeven onder hun "
 "naam in het roostervenster, indien deze niet leeg is"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5441,7 +5668,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:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5450,43 +5677,52 @@ msgstr ""
 "Indien Uit zullen geen statusberichten weergeven worden in gesprekken "
 "wanneer een contact zijn/haar status aanpassen."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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:201
+#: ../src/common/config.py:207
 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5497,220 +5733,232 @@ msgid ""
 "the changes will take effect."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:212
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, 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:209
+#: ../src/common/config.py:215
 #, 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:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Eten"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Ik ben aan het eten, laat een bericht achter."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Werken"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Uit"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Ik ben uit van het leven genieten"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Aanwezig"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Open voor Gesprek"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Niet Beschikbaar"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 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: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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "groen"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "kruidenier"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "menselijk"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "marine"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Wachtwoord"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5721,49 +5969,54 @@ msgstr ""
 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
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Die ruimte bestaat niet."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "Ruimte creatie is beperkt."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Je geregistreerde bijnaam moet gebruikt worden."
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Je staat niet in de ledenlijst"
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5772,27 +6025,27 @@ msgstr ""
 "gebruiker.\n"
 "Geef een andere bijnaam op:"
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we zijn nu op %s geabonneert"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "afmelding verzocht van %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we zijn nu van %s afgemeld"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5802,91 +6055,88 @@ msgstr ""
 "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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"Om verdere berichten te versturen en ontvangen, moet je de verbinding "
-"opnieuw in stand brengen."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
 #, python-format
-msgid "Transport %s answered wrongly to register request."
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Verbonden met server %s:%s met %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Controleer je verbinding of probeer later nogmaals"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggen mislukt met \"%s\""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP wachtwoord niet opgegeven"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "onzichtbaar"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, 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
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5895,16 +6145,16 @@ msgstr ""
 "Onderwerp: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 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
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogelijkheden van Gajim kunnen niet worden gebruikt"
 
@@ -6089,242 +6339,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Ongeldig character in gebruikersnaam."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Server adres vereist."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Ongeldig character in hostnaam."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Ongeldig character in bron."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Bezig"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Bezig"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Niet Beschikbaar"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "Open voor _Gesprek"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Open voor Gesprek"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Aanwezig"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Aanwezig"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "Af_wezig"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "Onz_ichtbaar"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Onbekend"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Heeft fouten"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Geen"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Aan"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Van"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Geen"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Beheerders"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Beheerder"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Deelnemers"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Deelnemer"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Bezoekers"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Bezoeker"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Eigenaar"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrator"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Lid"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "let op deze conversatie"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "is met iets anders bezig"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "pauzeert tijdens het typen van een bericht"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tab gesloten"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6335,49 +6585,116 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "fout: kan %s niet voor lezen openen"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr ""
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "cyaan"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "logboek database wordt aangemaakt"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "voor account %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Kon geen verbinding maken met gebruiker."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+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/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Niet in staat de ruimte binnen te gaan"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Dit bericht is versleuteld]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Abonneer"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "fout tijdens versturen"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Nieuwe Ruimte"
+
+#~ msgid "Role: "
+#~ msgstr "Rol: "
+
+#~ msgid "Affiliation: "
+#~ msgstr "Aansluiting: "
+
+#~ 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 ""
+#~ "Geluid om af te spelen bij elk MUC bericht. (Deze instelling is alleen "
+#~ "geldig als notify_on_all_muc_messages aan staat)"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6399,10 +6716,6 @@ msgstr "[Dit bericht is versleuteld]"
 #~ msgid "Not Available "
 #~ msgstr "Niet Beschikbaar"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Wis MOTD"
-
 #~ msgid "Contact _Info"
 #~ msgstr "Contact _Info"
 
@@ -6434,9 +6747,6 @@ msgstr "[Dit bericht is versleuteld]"
 #~ 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"
@@ -6521,9 +6831,6 @@ msgstr "[Dit bericht is versleuteld]"
 #~ "Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
 #~ "weergeven"
 
-#~ msgid "_Online Users"
-#~ msgstr "_Online Gebruikers"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Start Gesprek met account %s"
diff --git a/po/no.po b/po/no.po
index a9d4f570d..114e885f5 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-04-26 00:29+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -42,22 +42,26 @@ msgid "_Discover Services..."
 msgstr "_Oppdag Tjenester..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Gruppe Samtale"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Åpne ny Epost"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
@@ -243,16 +247,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Generelle"
 
@@ -314,17 +320,17 @@ msgid "Manage..."
 msgstr "Behandle..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ingen"
 
@@ -612,11 +618,11 @@ msgstr "Avansert Konfigurasjons Editor"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Status: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Borte"
 
@@ -634,7 +640,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -644,21 +650,25 @@ msgid "Launch a command"
 msgstr "kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Ledig for Prat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -671,16 +681,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -740,7 +747,7 @@ msgid "for "
 msgstr "Port:"
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -774,7 +781,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
@@ -797,7 +804,7 @@ msgstr "_Åpne Link i Nettleser"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
@@ -806,7 +813,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Send _Fil"
@@ -823,12 +830,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historie"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "I gruppen"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Rom Instillinger"
 
@@ -913,11 +925,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Samtalestatus Fane Farger</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Konto\n"
 "Gruppe\n"
@@ -968,7 +981,7 @@ msgstr ""
 "MUC Sendte\n"
 "Meldinger"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Pauset"
 
@@ -1107,14 +1120,14 @@ msgstr "Nekt"
 msgid "Invitation Received"
 msgstr "Invitasjon motatt"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
@@ -1132,8 +1145,8 @@ msgstr "Nylig:"
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1184,7 +1197,7 @@ msgstr "Behandle Proxy Profiler"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Navn:"
 
@@ -1200,14 +1213,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Handlinger"
 
@@ -1307,10 +1320,12 @@ msgid "Auto _not available after:"
 msgstr "Auto _ikke tilgjengelig etter:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Autodetekter hver gang Gajim starter\n"
@@ -1318,18 +1333,14 @@ msgstr ""
 "Alltid bruk KDE standard applikasjoner\n"
 "Egendefinert"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "F_ør kallenavn:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Samtale"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "Samtale status opp_lysninger:"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1341,39 +1352,59 @@ msgstr ""
 "ikke er i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Status Melding"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "Standard status _ikonsamling:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Samtale status opp_lysninger:"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "H_vert 5 minutt"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Uttrykksikoner:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha "
+"med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
+"sende motparten."
+
+#: ../data/glade/preferences_window.glade.h:43
 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 "
@@ -1383,21 +1414,21 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:44
 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:42
+#: ../data/glade/preferences_window.glade.h:45
 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:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1405,7 +1436,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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1413,19 +1444,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:45
+#: ../data/glade/preferences_window.glade.h:48
 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1433,7 +1464,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1441,7 +1472,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:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1449,7 +1480,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1458,7 +1489,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:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1466,11 +1497,15 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1482,84 +1517,95 @@ msgstr ""
 "Per konto\n"
 "Per type"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Alarmer meg om kontakter som:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Alarmer meg on nye _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "På hver _melding"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "En melding _vindu:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Samtale status opp_lysninger:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Utskrifts tid:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Den automatiserte borte meldinen"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Den autmatiserte ikke tilgjengelig meldingen"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Bruk _transportenes ikoner"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1571,96 +1617,102 @@ 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:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Når en ny hendelse blir motatt"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_Etter tid:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "_Før tid:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Font:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "_Innkommende melding:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Aldri"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Gi meg beskjed om det"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "_Utgående melding:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Spiller:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Sprett opp"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "_Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minutter"
 
@@ -1691,7 +1743,7 @@ msgstr ""
 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
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1709,7 +1761,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "Listen over Utestengte"
@@ -1778,116 +1830,116 @@ msgid "City:"
 msgstr "By:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Bedrift:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Land:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Avdeling:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Ekstra Adresse:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Fornavn:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Hjemmeside:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Mellomnavn:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Mer"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Personlig Informasjon"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefon Nummer:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Plassering:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Post Kode:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Tittel:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Rolle:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Fylke:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Gate:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Suffix:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Jobb"
 
@@ -1928,47 +1980,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Send _Melding"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Forby han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Abonement"
 
@@ -2014,8 +2073,8 @@ msgstr "_Innhold"
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Rediger"
 
@@ -2105,34 +2164,40 @@ msgid "_Send & Close"
 msgstr "_Send & Lukk"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Godkjenn"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Abbonerings Forespørsel"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Godkjenn"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Wav Lyder"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
@@ -2145,38 +2210,43 @@ msgstr "Spør:"
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Kommentar: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Kontakter"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ressurs:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Abbonement:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
@@ -2370,7 +2440,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2399,49 +2469,49 @@ msgstr "Tilkobling ikke tilgjengelig"
 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:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "ikke i kontaktliste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2449,96 +2519,101 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Hvert %s _minutt"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Neste Melding Motatt"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Invitasjon motatt"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 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:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2546,175 +2621,175 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 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:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 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:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 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:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2722,11 +2797,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2734,11 +2809,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2746,11 +2821,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2758,7 +2833,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2774,88 +2849,98 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Slett"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Utskrifts tid:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Gruppe Samtale"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/config.py:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 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:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Duplikat Jabber ID"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Kontakten er allerede konfigurert i Gajim."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2864,23 +2949,23 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Det skjedde en feil ved oppretting av kontoen"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2888,254 +2973,263 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
 "i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens navn: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adresse:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adresse:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Ekstra Adresse:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abbnerings ønske for konto %s fra %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abbonerings ønske fra %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Du er allerede i rom %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Rom navnet eller server navnet inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3145,258 +3239,268 @@ msgstr ""
 "å sende en melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Tilbkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Kontakt Logget Av"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enslig Melding med konto %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enslig Melding med konto %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Private Samtaler"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Du må skrive inn et passord for den nye kontoen"
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s har invitert deg til %(room_jid)s rom"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Tilkobling"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3404,51 +3508,69 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Utforsk %s med %s kontoen"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanner %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Abbonér"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Abbonér"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Abbonér"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Fil"
@@ -3474,7 +3596,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Du"
 
@@ -3484,7 +3606,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Mottaker: "
 
@@ -3551,31 +3673,31 @@ msgstr "Beskrivelse: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3611,12 +3733,11 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Avsender: "
 
@@ -3624,31 +3745,31 @@ msgstr "Avsender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim trenger en Xserver for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim trenger PyGTK 2.6 eller høyere"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim trenger GTK 2.6 eller høyere"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3657,21 +3778,21 @@ msgstr ""
 "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
 "versjon fra %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 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
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3679,86 +3800,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autentisering for %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Tilkobling"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Tittel: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "feil ved sending %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abbonementet fra deg"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Du vil alltid se han eller henne som frakoblet."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s er nå %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny E-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3768,56 +3889,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine instillinger og valg"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Tilkobling ikke tilgjengelig"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
@@ -3841,7 +3967,8 @@ msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Aktiver nytt vindu med den neste uleste melingen"
 
 #: ../src/gajim-remote.py:82
@@ -4173,8 +4300,8 @@ msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Du er ikke lenger i rommet \"%s\" eller \"%s\" har dratt."
 
 #: ../src/groupchat_control.py:141
@@ -4191,100 +4318,101 @@ msgid "Insert Nickname"
 msgstr "Endre _Kallenavn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "I gruppen"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s er nå %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Dette rommet har ingen tittel"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, 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:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn|JID> [årsak], utviser JIDen fra rommet. "
 "Kallenavnet til en bruker kan bli brukt, men ikke dersom det inneholder \"@"
 "\". 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:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4292,12 +4420,12 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den "
 "spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4306,21 +4434,21 @@ msgstr ""
 "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
 "dersom spesifisert."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Bruk: /%s, gjemmer samtale knappene."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Bruksanvisning: /%s <JID> [årsak], inviterer JID til gjeldende rom, og viser "
 "en årsak dersom spesifisert."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4329,27 +4457,27 @@ msgstr ""
 "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
 "gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn> [årsak], fjerner brukeren spesifisert av "
 "kallenavn fra rommet og viser om spesifisert en årsak. Støtter ikke "
 "mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
 "tredje person. (f.eks. /%s eksploderer.)"
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4358,25 +4486,25 @@ msgstr ""
 "Bruk: /%s <kallenavn> [melding], åpner et privat meldingsvindu og sender "
 "meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende rom."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer gjeldende rom tittel."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer gjeldende rom tittel."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4384,69 +4512,71 @@ msgstr ""
 "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
 "kommandoer."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av rommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Dersom du lukker dette vinduet, så vil du bli koblet fra dette rommet."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Rommet \"%s\" er allerede i dine bokmerker."
 
-#: ../src/groupchat_control.py:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Utvis %s"
@@ -4477,73 +4607,73 @@ msgstr "Detaljer"
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Lagre Fil som..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Melding"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Tittel"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 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:184
+#: ../src/history_manager.py:188
 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 "
@@ -4557,26 +4687,26 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, 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:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 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?"
@@ -4607,11 +4737,11 @@ msgstr "Status er nå: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4651,46 +4781,46 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Invitasjon motatt"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4698,86 +4828,87 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observerere"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat 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
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "bruker kontoen %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Behandle Bokmerker..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
-#: ../src/roster_window.py:3027
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, 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
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4785,12 +4916,12 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
 "transporten."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4799,74 +4930,124 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
 "transporten."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Kontakter"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Gi Nytt Navn"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Fjern"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Fjerner kontakt fra kontaktlisten"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Nytt Rom"
+msgid "_New group chat"
+msgstr "Gruppe Samtale"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "_Send Server Melding"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "_Online Brukere"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Logg på"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4874,7 +5055,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:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4882,17 +5063,17 @@ 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:2334
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4901,32 +5082,32 @@ 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
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
 
-#: ../src/roster_window.py:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4934,20 +5115,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:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4955,111 +5136,134 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått."
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr "Du må lage en konto før du kan snakke med andre kontakter."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Tøm %s i samtalerom %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Rolle: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Tilhørighet: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Siste status på %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "siden %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Abbonement: "
+
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Komplett"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5067,25 +5271,25 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Tilhørighet: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5093,7 +5297,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5101,13 +5305,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5115,121 +5319,121 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s er en fil men skulle ha vært en katalog"
 
-#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s er en katalog men skulle vært en fil"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Bruk DBus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Borte på grunn av inaktivitet"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Ikke tilgjengelig på grunn av inaktivitet"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formatterings symboler."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5237,12 +5441,12 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5250,11 +5454,11 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5263,37 +5467,58 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:153
 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:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5301,30 +5526,34 @@ msgstr ""
 "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
 "adresse oversetting/port videresending."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis fane felt ved bare en aktiv samtale?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtale."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5332,11 +5561,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:187
+#: ../src/common/config.py:191
 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:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5344,7 +5573,7 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5353,7 +5582,7 @@ msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5361,7 +5590,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:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5370,29 +5599,37 @@ 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:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5402,18 +5639,19 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5432,67 +5670,82 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 #, 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:206
+#: ../src/common/config.py:212
 #, 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:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Gjemmer knappene i gruppe samtale vindu"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "Gjemmer knappene i to personers samtale vindu"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet"
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5500,151 +5753,148 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Tilgjengelig"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Ledig for Prat"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Ikke tilgjengelig"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 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: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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "marine"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Feil Passordsetning"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5655,49 +5905,54 @@ msgstr ""
 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
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "Et passord kreves for å bli med i dette samtalerommet."
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Du er uønsket i dette rommet."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Et slikt rom finnes ikke."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "Rom oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Ditt registrerte kallenavn må bli brukt. "
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Du er ikke medlems listen."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5706,27 +5961,27 @@ msgstr ""
 "samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abbonerer nå på %s"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abbonerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5736,88 +5991,87 @@ msgstr ""
 "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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../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:165
+msgid "Reconnect manually."
+msgstr ""
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Transporten %s svarte feil på registrerings forespørselen."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Tilkoblet til server %s:%s med %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "usynlig"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, 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
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5826,16 +6080,16 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 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
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 
@@ -6025,242 +6279,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Fra"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Abbonér"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Modererere"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Modererer"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Eier"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrator"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Medlem"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6271,50 +6525,115 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "lager logg database"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "for konto %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Tilkoblingen kan ikke opprettes."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+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/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, 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
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Abbonér"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "feil ved sending %s ( %s )"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Nytt Rom"
+
+#~ msgid "Role: "
+#~ msgstr "Rolle: "
+
+#~ msgid "Affiliation: "
+#~ msgstr "Tilhørighet: "
+
+#~ 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 ""
+#~ "Lyd som spilles når en ny MUC melding kommer. (Denne instillingen er kun "
+#~ "aktiv når notify_on_all_muc_messages er True)"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6336,10 +6655,6 @@ msgstr "[Denne meldingen er kryptert]"
 #~ msgid "Not Available "
 #~ msgstr "Ikke tilgjengelig"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Slett"
-
 #~ msgid "Contact _Info"
 #~ msgstr "Kontakt_Info"
 
@@ -6370,9 +6685,6 @@ msgstr "[Denne meldingen er kryptert]"
 #~ 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"
@@ -6458,9 +6770,6 @@ msgstr "[Denne meldingen er kryptert]"
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
 
-#~ msgid "_Online Users"
-#~ msgstr "_Online Brukere"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Start samtale med konto %s"
diff --git a/po/pl.po b/po/pl.po
index 27e592613..c7ddb2a95 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-11 08:53+0100\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-11-08 09:01+0100\n"
 "Last-Translator: Maciej Chojnacki <byte@byte.livenet.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -45,21 +45,25 @@ msgid "_Discover Services..."
 msgstr "_Wyszukuj usługi..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Pokój"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modyfikuj konto..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 msgid "_Open Gmail Inbox"
 msgstr "_Otwórz skrzynkę odbiorczą Gmail"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
@@ -244,16 +248,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:901
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:332 ../src/roster_window.py:1382
-#: ../src/roster_window.py:1901 ../src/roster_window.py:1934
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Ogólne"
 
@@ -314,17 +320,17 @@ msgid "Manage..."
 msgstr "Zarządzaj..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1598
-#: ../src/config.py:3356
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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:1188
-#: ../src/config.py:1193 ../src/config.py:1373 ../src/config.py:1588
-#: ../src/config.py:1597 ../src/config.py:1656 ../src/config.py:1729
-#: ../src/config.py:2583 ../src/config.py:3346 ../src/config.py:3355
-#: ../src/dialogs.py:280 ../src/dialogs.py:282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Żaden"
 
@@ -610,11 +616,12 @@ msgid "Advanced Notifications Control"
 msgstr "Edytor ustawień zaawansowanych"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
-msgid "All Status "
+#, fuzzy
+msgid "All statuses"
 msgstr "dowolny status "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Zaraz wracam"
 
@@ -631,7 +638,7 @@ msgid "Have "
 msgstr "rozmawiam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Niewidoczny"
 
@@ -640,19 +647,24 @@ msgid "Launch a command"
 msgstr "Wykonaj komendę"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Nieobecny"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+#, fuzzy
+msgid "One or more special statuses..."
+msgstr "określony status..."
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 msgid "Online / Free For Chat"
 msgstr "Dostępny / Chętny do rozmowy"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid "Play a sound"
 msgstr "Odtwórz dźwięk"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -674,16 +686,14 @@ msgstr ""
 "rozpocznie się transfer pliku\n"
 "zakończy się transfer pliku"
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr "określony status..."
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr "Jeżeli "
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+#, fuzzy
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr "_Migaj obramowaniem okna rozmowy"
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -741,7 +751,8 @@ msgid "for "
 msgstr "dla "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+#, fuzzy
+msgid "when I'm in"
 msgstr "kiedy mam "
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -775,7 +786,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "Dod_aj do listy kontaktów"
 
@@ -807,7 +818,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Wyślij _plik"
@@ -824,12 +835,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historia"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "według grupy"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Konfiguracja pokoju"
 
@@ -969,7 +985,7 @@ msgstr ""
 "Czat\n"
 "Wiadomości"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:602
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Zatrzymany"
 
@@ -1110,7 +1126,7 @@ msgstr "Odmów"
 msgid "Invitation Received"
 msgstr "Zaproszenie Odebrane"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1136
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
@@ -1135,8 +1151,8 @@ msgstr "Ostatnio:"
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Dołącz"
 
@@ -1202,14 +1218,14 @@ 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:1096
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Działania"
 
@@ -1334,10 +1350,6 @@ msgid "Chat"
 msgstr "Rozmowa"
 
 #: ../data/glade/preferences_window.glade.h:31
-msgid "Chat state noti_fications:"
-msgstr "Powiadomienia o stanie _rozmowy:"
-
-#: ../data/glade/preferences_window.glade.h:32
 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 "
@@ -1347,30 +1359,35 @@ msgstr ""
 "wiadomościami. Stosuj ją ostrożnie, ponieważ powoduje ona blokowanie "
 "wszystkich wiadomości osób, których nie masz na liście kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:32
 msgid "Configure color and font of the interface"
 msgstr "Konfiguruj kolor i czcionkę interfejsu"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default Status Messages"
 msgstr "Domyślne stany opisowe"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "Domyślny zestaw ikon _statusu:"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr "Wyświetlaj _dodatkowe informacje o poczcie e-mail"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Wyświetlaj awatary kontaktów z listy"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:37
 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:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Powiadomienia o stanie _rozmowy:"
+
 #: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "Co 5 _minut"
@@ -1384,22 +1401,32 @@ msgid "Events"
 msgstr "Zdarzenia"
 
 #: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
 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."
+"display in chat windows."
 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:43
 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:44
+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:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1407,7 +1434,7 @@ 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:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1415,7 +1442,7 @@ 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:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1423,12 +1450,12 @@ 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:47
+#: ../data/glade/preferences_window.glade.h:48
 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:49
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1436,7 +1463,7 @@ msgstr ""
 "Jeżeli opcja ta zostanie uaktywniona, Gajim będzie również wyświetlał "
 "informacje o nadawcach nowej poczty w twojej skrzynce"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1444,7 +1471,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy "
 "kontaktów (roster oraz okno czatu)"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1452,7 +1479,7 @@ 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:52
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1460,7 +1487,7 @@ 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:53
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1470,7 +1497,7 @@ msgstr ""
 "transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu "
 "dostępny, zaraz wracam, zajęty, itd"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1478,15 +1505,15 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje zastąpienie emotikon tekstowych jak ':)' "
 "emotikonami graficznymi"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid "Ignore rich content in incoming messages"
 msgstr "Ignoruj wzbogaconą treść w wiadomościach"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "Za_rządzaj..."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1498,55 +1525,60 @@ msgstr ""
 "Według konta\n"
 "Według typu"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Powiadom mnie o kontaktach zmieniających status na: "
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Notify on new _GMail email"
 msgstr "Powiadamiaj o nowej poczcie na koncie _GMail"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "W każdej _wiadomości"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "Grupuj okna:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Powiadomienia o stanie _rozmowy:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Odtwórz _dźwięk"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Wyświetlaj czas:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 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:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr "Wyświetlaj informacje o odtwarzanej _muzyce w statusie opisowym"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Pokaż tylko _listę kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "_Połączony"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "R_ozłączony"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:75
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1555,35 +1587,35 @@ msgstr ""
 "formatowanie. Jeżeli ta opcja jest aktywna, Gajim będzie ignorował te "
 "dodatki i wyświetlał czysty tekst."
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "_Motyw:"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Automatyczny status \"Zaraz wracam\""
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Automatyczny status \"Nieobecny\""
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Używaj zestawów ikon _transportów"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr "Użyj _domyślnej dla systemu"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Ikona w obszarze powiadamiania"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1594,11 +1626,11 @@ msgstr ""
 "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:82
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Gdy odebrane zostanie nowe zdarzenie"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid ""
 "Works for Rhythmbox and Muine players. For more players, please visit http://"
 "trac.gajim.org/wiki/GajimAndMusicPlayer"
@@ -1607,94 +1639,98 @@ msgstr ""
 "obsłudze innego oprogramowania, odwiedź stronę http://trac.gajim.org/wiki/"
 "GajimAndMusicPlayer"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Advanced Notifications Control..."
 msgstr "_Edytor zaawansowanych ustawień"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_Po czasie:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "P_rzed czasem:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "Prze_glądarka:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "Menadżer _plików:"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Czcionka:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "Podś_wietlaj błędy w pisowni"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 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:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "Wiadomość _otrzymana:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "Klient _poczty:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Nigdy"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "Powia_dom mnie o tym"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Otwórz..."
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "Wysłana wiadomość :"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Program odtwarzający dźwięk:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Wyświetl"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "Wróć do kolorów _domyślnych"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "Sortuj kontakty według statusu"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "_Informacja o statusie:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minutach"
 
+#: ../data/glade/privacy_lists_window.glade.h:1
+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>"
@@ -1715,7 +1751,7 @@ msgstr "Aktywny w tej sesji"
 msgid "Active on each startup"
 msgstr "P_ołącz przy starcie programu"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2582
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr "wszystkim"
 
@@ -1731,7 +1767,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Kolejność:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1826
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr "Lista prywatności"
 
@@ -1771,10 +1807,6 @@ msgstr "wysyłać mi status"
 msgid "to view my status"
 msgstr "widzieć mój status"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
-msgid "Privacy Lists:"
-msgstr "Listy 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
@@ -1888,7 +1920,7 @@ msgid "Prefix:"
 msgstr "Prefiks:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:271
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Funkcja:"
 
@@ -1949,45 +1981,52 @@ 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:1865
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1823
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:1954
 msgid "In_vite to"
 msgstr "_Zaproś do"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
 #: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Wyślij _wiadomość"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Rozpocznij _rozmowę"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 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:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabroń mu/jej widzieć twój status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1817 ../src/roster_window.py:2004
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Usuń z listy kontaktów"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1992
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Autoryzacja"
 
@@ -2031,8 +2070,8 @@ msgstr "_Zawartość"
 msgid "_Discover Services"
 msgstr "_Wyszukuj usługi"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1984
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Edycja"
 
@@ -2121,23 +2160,24 @@ msgid "_Send & Close"
 msgstr "_Wyślij i zamknij"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Autoryzuj"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Prośba o autoryzację"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Autoryzuj"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "O_dmów"
@@ -2178,7 +2218,7 @@ msgstr "Kontakt"
 
 #: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:415
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -2388,7 +2428,7 @@ msgstr "szwedzki"
 msgid "Chinese (Ch)"
 msgstr "chiński (Ch)"
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1482
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2427,41 +2467,41 @@ msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pokoju %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1110
+#: ../src/chat_control.py:1113
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "Ani %s nie przesyła swojego klucza OpenPGP, ani Ty nie przypisałeś mu "
 "żadnego klucza"
 
-#: ../src/chat_control.py:1237
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Szyfrowanie włączone"
 
-#: ../src/chat_control.py:1242
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Szyfrowanie wyłączone"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1384 ../src/conversation_textview.py:490
-#: ../src/dialogs.py:628 ../src/gajim.py:677 ../src/gajim.py:678
-#: ../src/gajim.py:1014 ../src/roster_window.py:318
-#: ../src/roster_window.py:378 ../src/roster_window.py:1533
-#: ../src/roster_window.py:1692 ../src/roster_window.py:2235
-#: ../src/roster_window.py:2437 ../src/roster_window.py:2448
-#: ../src/roster_window.py:3698 ../src/roster_window.py:3700
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
 #: ../src/common/contacts.py:73 ../src/common/helpers.py:42
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1529
+#: ../src/chat_control.py:1530
 #, 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:1530
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2469,29 +2509,29 @@ msgstr ""
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: ../src/config.py:130 ../src/config.py:575
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../src/config.py:214
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Co %s _minut"
 
-#: ../src/config.py:345
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:353
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:665 ../src/gajim.py:2008
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: ../src/config.py:666 ../src/gajim.py:2009
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2500,244 +2540,249 @@ msgstr ""
 "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
 "inny język korzystać z opcji speller_langugage."
 
-#: ../src/config.py:1009
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
-#: ../src/config.py:1044
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Otrzymałeś nową wiadomość"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:1249
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Zaproszenie Odebrane"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1296
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1299 ../src/config.py:1883
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Nieprzeczytane wiadomości"
 
-#: ../src/config.py:1300
+#: ../src/config.py:1333
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
 
-#: ../src/config.py:1304
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
 
-#: ../src/config.py:1305
+#: ../src/config.py:1338
 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:1309 ../src/config.py:1313
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1310
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1314
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1322 ../src/config.py:1328 ../src/config.py:1337
-#: ../src/config.py:2969
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:1387
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:1388
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:1511 ../src/common/config.py:359
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: ../src/config.py:1521
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Czy zalogować się ponownie?"
 
-#: ../src/config.py:1522
+#: ../src/config.py:1559
 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."
 
-#: ../src/config.py:1548
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:1549
+#: ../src/config.py:1586
 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:1555 ../src/dialogs.py:1118 ../src/dialogs.py:1282
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:1556
+#: ../src/config.py:1594
 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:1560
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: ../src/config.py:1561
+#: ../src/config.py:1599
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#: ../src/config.py:1585 ../src/config.py:3343
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:1586 ../src/config.py:3344
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
 
-#: ../src/config.py:1589 ../src/config.py:3347
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
 
-#: ../src/config.py:1590 ../src/config.py:3348
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
 #. Name column
-#: ../src/config.py:1819 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1822
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/config.py:1884
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
 
-#: ../src/config.py:1919
+#: ../src/config.py:1962
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Masz otwarte okno rozmowy na koncie %s"
 
-#: ../src/config.py:1920
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?"
 
-#: ../src/config.py:1975
+#: ../src/config.py:2022
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: ../src/config.py:1975
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local."
 
-#: ../src/config.py:2201
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:2203
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
 #. list at the begining
-#: ../src/config.py:2274
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: ../src/config.py:2275
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:2276
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:2277
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2310 ../src/disco.py:743 ../src/history_manager.py:154
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2318
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2323
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2327
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2348
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2350
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2745,11 +2790,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2352
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2353
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2757,11 +2802,11 @@ msgstr ""
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2356
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2769,11 +2814,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
 
-#: ../src/config.py:2359
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2781,7 +2826,7 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2360
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2797,91 +2842,96 @@ 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:2465
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2482 ../src/roster_window.py:2501
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2483 ../src/roster_window.py:2502
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2484 ../src/roster_window.py:2503
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2497
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2498
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2582
+#: ../src/config.py:2638
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../src/config.py:2583
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Wyświetlaj status:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:2653
+#: ../src/config.py:2709
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
 
-#: ../src/config.py:2684
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2685
+#: ../src/config.py:2742
 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:2945
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:2946
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:2955 ../src/dialogs.py:1301
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/config.py:2956
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Musisz wpisać hasło dla nowego konta."
 
-#: ../src/config.py:2960 ../src/dialogs.py:1306
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../src/config.py:2961 ../src/dialogs.py:1307
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
-#: ../src/config.py:2980
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Taki Jabber ID już istnieje!"
 
-#: ../src/config.py:2981
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Konto o takiej nazwie jest już skonfigurowane."
 
-#: ../src/config.py:2998
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:2999 ../src/config.py:3032
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2889,23 +2939,23 @@ msgstr ""
 "Możesz ustawić opcje zaawansowane wciskając przycisk Zaawansowane lub "
 "później wybierając pozycję Konta z menu Edytuj w głównym oknie programu."
 
-#: ../src/config.py:3031
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:3047
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: ../src/config.py:3104
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:3105
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2913,52 +2963,52 @@ 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:342
+#: ../src/conversation_textview.py:340
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Działania dla wyrażenia \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "%i dni temu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:786
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
@@ -2969,8 +3019,8 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Nazwa kontaktu: <i>%s</i>"
 
 #: ../src/dialogs.py:61
-#, python-format
-msgid "JID: <i>%s</i>"
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
 #: ../src/dialogs.py:211
@@ -2989,124 +3039,124 @@ msgstr "Identyfikator klucza"
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: ../src/dialogs.py:317
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/dialogs.py:319
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Opis statusu"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Szablony opisów"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Podaj nazwę dla tego szablonu"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:417
 msgid "AIM Address:"
 msgstr "_Adres AIM:"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:420
 msgid "MSN Address:"
 msgstr "_Adres MSN:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:421
 msgid "Yahoo! Address:"
 msgstr "Adres _Yahoo:"
 
-#: ../src/dialogs.py:456
+#: ../src/dialogs.py:457
 #, 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:458
+#: ../src/dialogs.py:459
 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:466 ../src/disco.py:100 ../src/disco.py:101
-#: ../src/disco.py:1248 ../src/roster_window.py:256
-#: ../src/roster_window.py:315 ../src/roster_window.py:351
-#: ../src/roster_window.py:419 ../src/roster_window.py:442
-#: ../src/roster_window.py:444 ../src/roster_window.py:3694
-#: ../src/roster_window.py:3696 ../src/common/helpers.py:42
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/dialogs.py:608 ../src/dialogs.py:614
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:665
 msgid "User ID:"
 msgstr "ID uzytkownika:"
 
-#: ../src/dialogs.py:727
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr "Wersja GTK+:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr "Wersja PyGTK:"
 
-#: ../src/dialogs.py:743
+#: ../src/dialogs.py:744
 msgid "Current Developers:"
 msgstr "Bieżący deweloperzy:"
 
-#: ../src/dialogs.py:745
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Poprzedni deweloperzy:"
 
-#: ../src/dialogs.py:755
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "Podziękowania:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:761
+#: ../src/dialogs.py:762
 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:775
+#: ../src/dialogs.py:776
 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:905
+#: ../src/dialogs.py:906
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Nie można podłączyć się do portu %s."
 
-#: ../src/dialogs.py:906
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
@@ -3114,57 +3164,57 @@ msgstr ""
 "Być może masz już uruchomioną inną kopię Gajima. Przesyłanie plików zostanie "
 "anulowane."
 
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Prośba o autoryzację dla konta %s od %s"
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:1111 ../src/roster_window.py:646
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1129
 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:1134
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 msgid "Invalid group chat Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/dialogs.py:1204
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1225
 msgid "This is not a group chat"
 msgstr "To nie jest czat"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1226
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie jest nazwą czatu."
 
-#: ../src/dialogs.py:1233
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowę z konta %s"
 
-#: ../src/dialogs.py:1235
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:1236
+#: ../src/dialogs.py:1251
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3173,260 +3223,260 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1261 ../src/dialogs.py:1620 ../src/dialogs.py:1749
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:1262 ../src/dialogs.py:1621 ../src/dialogs.py:1750
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:1271 ../src/dialogs.py:1274
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: ../src/dialogs.py:1274
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie można sparsować \"%s\"."
 
-#: ../src/dialogs.py:1283
+#: ../src/dialogs.py:1298
 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:1302
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1349 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:1351 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #. chat message
-#: ../src/dialogs.py:1353 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #. single message
-#: ../src/dialogs.py:1353 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
 #. private message
-#: ../src/dialogs.py:1354 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:1354 ../src/gajim.py:1107 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:1356 ../src/gajim.py:1248 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:1358 ../src/gajim.py:1081 ../src/gajim.py:1224
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:1360 ../src/gajim.py:1284 ../src/gajim.py:1306
-#: ../src/gajim.py:1323 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/dialogs.py:1361 ../src/gajim.py:1287 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:1363 ../src/gajim.py:979 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: ../src/dialogs.py:1365 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#: ../src/dialogs.py:1550
+#: ../src/dialogs.py:1565
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:1552
+#: ../src/dialogs.py:1567
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:1554
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1557
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1580
+#: ../src/dialogs.py:1595
 #, 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:1652
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1653
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:1697
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:1699
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#: ../src/dialogs.py:1820
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1824
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: ../src/dialogs.py:1872
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr "Kolejność: %s, akcja: %s, typ: %s, wartość: %s"
 
-#: ../src/dialogs.py:1875
+#: ../src/dialogs.py:1890
 #, python-format
 msgid "Order: %s, action: %s"
 msgstr "Kolejność: %s, akcja: %s"
 
-#: ../src/dialogs.py:1917
+#: ../src/dialogs.py:1932
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: ../src/dialogs.py:2004
+#: ../src/dialogs.py:2019
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: ../src/dialogs.py:2100
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: ../src/dialogs.py:2102
+#: ../src/dialogs.py:2117
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: ../src/dialogs.py:2170
+#: ../src/dialogs.py:2185
 msgid "Invalid List Name"
 msgstr "Niepoprawna nazwa listy"
 
-#: ../src/dialogs.py:2171
+#: ../src/dialogs.py:2186
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2205
+#: ../src/dialogs.py:2220
 #, python-format
 msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s zaprasza cię do pokoju %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2211
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:2273
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:2283 ../src/dialogs.py:2328
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:2288
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:2318
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:2390
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: ../src/dialogs.py:2392
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
 #. # means number
-#: ../src/dialogs.py:2463
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr "Nr"
 
-#: ../src/dialogs.py:2469
+#: ../src/dialogs.py:2484
 msgid "Condition"
 msgstr "Warunek"
 
-#: ../src/dialogs.py:2590
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr "kiedy mam "
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Inni"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Konferencja"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 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:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Przeglądanie usług przy użyciu konta %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Nie można odnaleźć usługi"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3434,51 +3484,69 @@ msgstr ""
 "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź "
 "adres i spróbuj ponownie."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Tej usługi nie można przeglądać"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Przeglądanie %s przy użyciu konta %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "Prze_glądaj"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 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:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanowanie %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Użytkownicy"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr "Id"
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Autoryzuj"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Autoryzuj"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Autoryzuj"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Plik"
@@ -3514,7 +3582,7 @@ msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:574
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
@@ -3581,32 +3649,32 @@ msgstr "Opis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s chce przesłać Ci plik:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie można nadpisać pliku \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:686
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 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:326 ../src/gtkgui_helpers.py:690
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:690
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Nie masz uprawnień do zapisu w folderze \"%s\""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:701
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie masz uprawnień do tworzenia plików w tym folderze."
 
@@ -3642,11 +3710,11 @@ msgstr "Plik: "
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:564
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:568
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Nadawca: "
 
@@ -3654,6 +3722,213 @@ msgstr "Nadawca: "
 msgid "Pause"
 msgstr "Zatrzymaj"
 
+#: ../src/gajim.py:47
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim wymaga do działania serwera X. Zakończenie..."
+
+#: ../src/gajim.py:51
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim wymaga PyGTK w wersji 1.6 lub wyższej"
+
+#: ../src/gajim.py:52
+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:54
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim wymaga GTK w wersji 2.6 lub wyższej"
+
+#: ../src/gajim.py:55
+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:60
+msgid "GTK+ runtime is missing libglade support"
+msgstr "W GTK+ brakuje wsparcia dla libglade"
+
+#: ../src/gajim.py:62
+#, 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:64
+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:69
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim wymaga do działania PySQLite2"
+
+#: ../src/gajim.py:76
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim wymaga do działania pakietu pywin32"
+
+#: ../src/gajim.py:77
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Proszę upewnić się, że zainstalowany jest pakiet Pywin32. Możesz go pobrać "
+"spod adresu %s"
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:189
+msgid "Gajim is already running"
+msgstr "Gajim jest już uruchomiony"
+
+#: ../src/gajim.py:190
+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:297
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)"
+
+#: ../src/gajim.py:298
+msgid "Do you accept this request?"
+msgstr "Czy akceptujesz tę prośbę?"
+
+#: ../src/gajim.py:344 ../src/notify.py:430
+msgid "Connection Failed"
+msgstr "Połączenie nie powiodło się"
+
+#: ../src/gajim.py:656
+#, python-format
+msgid "Subject: %s"
+msgstr "Temat: %s"
+
+#: ../src/gajim.py:701
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "błąd przy wysyłaniu %s ( %s )"
+
+#: ../src/gajim.py:741
+msgid "Authorization accepted"
+msgstr "Autoryzacja przyjęta"
+
+#: ../src/gajim.py:742
+#, 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:750
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
+
+#: ../src/gajim.py:751
+msgid "You will always see him or her as offline."
+msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
+
+#: ../src/gajim.py:794
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Nie można ustanowić połączenia z \"%s\""
+
+#: ../src/gajim.py:795 ../src/common/connection.py:395
+msgid "Check your connection or try again later."
+msgstr "Sprawdź swoje połączenie lub spróbuj później."
+
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s ma teraz status %s (%s)"
+
+#: ../src/gajim.py:1040
+msgid "Your passphrase is incorrect"
+msgstr "Twoje hasło jest niepoprawne"
+
+#: ../src/gajim.py:1041
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
+
+#: ../src/gajim.py:1143
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1145
+#, 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"
+msgstr[2] "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:1154
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"Od: %(from_address)s"
+
+#: ../src/gajim.py:1297
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s chce przesłać ci plik."
+
+#: ../src/gajim.py:1362
+#, 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:1366
+#, 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:1379
+#, 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:1383
+#, 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:1489
+msgid "Username Conflict"
+msgstr "Konflikt nazw użytkownika"
+
+#: ../src/gajim.py:1490
+msgid "Please type a new username for your local account"
+msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1828
+msgid "Could not save your settings and preferences"
+msgstr "Nie można zapisać twoich ustawień i opcji"
+
+#: ../src/gajim.py:2020
+msgid "Network Manager support not available"
+msgstr "Brak wsparcia dla Network Managera"
+
+#: ../src/gajim.py:2095
+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
 msgid "Shows a help on specific command"
 msgstr "Wyświetla pomoc dla wybranego polecenia"
@@ -3966,213 +4241,6 @@ msgstr ""
 "Argument \"%s\" nie jest określony. \n"
 "Wpisz \"%s·help·%s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim.py:46
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim wymaga do działania serwera X. Zakończenie..."
-
-#: ../src/gajim.py:50
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim wymaga PyGTK w wersji 1.6 lub wyższej"
-
-#: ../src/gajim.py:51
-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:53
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim wymaga GTK w wersji 2.6 lub wyższej"
-
-#: ../src/gajim.py:54
-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:59
-msgid "GTK+ runtime is missing libglade support"
-msgstr "W GTK+ brakuje wsparcia dla libglade"
-
-#: ../src/gajim.py:61
-#, 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:63
-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:68
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim wymaga do działania PySQLite2"
-
-#: ../src/gajim.py:75
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim wymaga do działania pakietu pywin32"
-
-#: ../src/gajim.py:76
-#, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr ""
-"Proszę upewnić się, że zainstalowany jest pakiet Pywin32. Możesz go pobrać "
-"spod adresu %s"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:149
-msgid "Gajim is already running"
-msgstr "Gajim jest już uruchomiony"
-
-#: ../src/gajim.py:150
-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:250
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)"
-
-#: ../src/gajim.py:251
-msgid "Do you accept this request?"
-msgstr "Czy akceptujesz tę prośbę?"
-
-#: ../src/gajim.py:297 ../src/notify.py:432
-msgid "Connection Failed"
-msgstr "Połączenie nie powiodło się"
-
-#: ../src/gajim.py:608
-#, python-format
-msgid "Subject: %s"
-msgstr "Temat: %s"
-
-#: ../src/gajim.py:653
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "błąd przy wysyłaniu %s ( %s )"
-
-#: ../src/gajim.py:693
-msgid "Authorization accepted"
-msgstr "Autoryzacja przyjęta"
-
-#: ../src/gajim.py:694
-#, 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:702
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
-
-#: ../src/gajim.py:703
-msgid "You will always see him or her as offline."
-msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
-
-#: ../src/gajim.py:746
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Nie można ustanowić połączenia z \"%s\""
-
-#: ../src/gajim.py:747 ../src/common/connection.py:391
-msgid "Check your connection or try again later."
-msgstr "Sprawdź swoje połączenie lub spróbuj później."
-
-#: ../src/gajim.py:892 ../src/roster_window.py:1178
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s ma teraz status %s (%s)"
-
-#: ../src/gajim.py:989
-msgid "Your passphrase is incorrect"
-msgstr "Twoje hasło jest niepoprawne"
-
-#: ../src/gajim.py:990
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
-
-#: ../src/gajim.py:1092
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1094
-#, 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"
-msgstr[2] "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:1103
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-"\n"
-"Od: %(from_address)s"
-
-#: ../src/gajim.py:1245
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s chce przesłać ci plik."
-
-#: ../src/gajim.py:1307
-#, 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:1311
-#, 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:1324
-#, 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:1328
-#, 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:1430
-msgid "Username Conflict"
-msgstr "Konflikt nazw użytkownika"
-
-#: ../src/gajim.py:1431
-msgid "Please type a new username for your local account"
-msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1767
-msgid "Could not save your settings and preferences"
-msgstr "Nie można zapisać twoich ustawień i opcji"
-
-#: ../src/gajim.py:1957
-msgid "Network Manager support not available"
-msgstr "Brak wsparcia dla Network Managera"
-
-#: ../src/gajim.py:2028
-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_themes_window.py:60
 msgid "Theme"
 msgstr "Motyw"
@@ -4252,56 +4320,56 @@ msgstr "Występujesz teraz jako %s"
 msgid "%s is now known as %s"
 msgstr "%s występuje teraz jako %s"
 
-#: ../src/groupchat_control.py:895
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:900
+#: ../src/groupchat_control.py:899
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
 #. No status message
-#: ../src/groupchat_control.py:902 ../src/roster_window.py:1181
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s ma teraz status %s"
 
-#: ../src/groupchat_control.py:1021 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Pseudonim nie został odnaleziony: %s"
 
-#: ../src/groupchat_control.py:1055
+#: ../src/groupchat_control.py:1054
 msgid "This group chat has no subject"
 msgstr "Ten pokój nie ma tematu"
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1067
 #, 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:1075 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nie wygląda na poprawny JID"
 
-#: ../src/groupchat_control.py:1186
+#: ../src/groupchat_control.py:1185
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Nie ma takiego polecenia: /%s (jeśli chcesz je wysłać, poprzedź je znakami: /"
 "say)"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Polecenia: %s"
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4313,18 +4381,18 @@ msgstr ""
 "może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w "
 "pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr "Użycie: /%s <pseudonim> otwiera okno prywatnej rozmowy z tą osobą."
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Użycie: /%s czyście okno tekstowe."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4333,12 +4401,12 @@ msgstr ""
 "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, jeśli "
 "został podany."
 
-#: ../src/groupchat_control.py:1227
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Użycie: /%s ukrywa przyciski czatu."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1229
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4347,7 +4415,7 @@ msgstr ""
 "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
 "wyświetlając powód."
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4356,7 +4424,7 @@ msgstr ""
 "Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do "
 "pokój@serwer opcjonalnie z wykorzystaniem podanego psedonimu."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1237
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4366,7 +4434,7 @@ msgstr ""
 "Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z "
 "pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4375,7 +4443,7 @@ msgstr ""
 "Użycie: /%s <działanie> wysyła działanie do aktualnego pokoju. Używaj w "
 "trzeciej osobie (np. /%s eksploduje.)"
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4384,92 +4452,92 @@ msgstr ""
 "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
 "wysyła ją do osoby o takim pseudonimie."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1251
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1255
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Użycie: /%s [temat] wyświetla lub aktualizuje temat aktualnego pokoju."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1262
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Użycie: /%s <wiadomość> wysyła wiadomość bez sprawdzania innych poleceń."
 
-#: ../src/groupchat_control.py:1266
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Brak informacji o pomocy dla /%s"
 
-#: ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1314
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
 
-#: ../src/groupchat_control.py:1317
+#: ../src/groupchat_control.py:1316
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Jeśli zamkniesz to okno, połączenie z tym pokojem zostanie zerwane."
 
-#: ../src/groupchat_control.py:1321 ../src/roster_window.py:3822
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie"
 
-#: ../src/groupchat_control.py:1355
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1366
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
 
-#: ../src/groupchat_control.py:1391
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1391
 #, 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:1401
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/groupchat_control.py:1402
+#: ../src/groupchat_control.py:1401
 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:1530
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:1531 ../src/groupchat_control.py:1814
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1813
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -4516,18 +4584,18 @@ 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ć"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr "Rozszerzenie nie jest obsługiwane"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:728
 #, 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?"
 
-#: ../src/gtkgui_helpers.py:739
+#: ../src/gtkgui_helpers.py:737
 msgid "Save Image as..."
 msgstr "Zapisz plik jako..."
 
@@ -4681,45 +4749,45 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr "Pobieranie profilu..."
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr "Kliknij aby ustawić avatar"
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 msgid "Information received"
 msgstr "Informacja została odebrana"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr "Wysyłanie profilu..."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr "Informacja została opublikowana"
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr "Informacja NIE ZOSTAŁA opublikowana"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4727,26 +4795,26 @@ msgstr ""
 "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
 "później."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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:170 ../src/roster_window.py:222
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:330 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Obserwatorzy"
 
-#: ../src/roster_window.py:650 ../src/roster_window.py:2957
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
 
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:844 ../src/systray.py:185 ../src/systray.py:190
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
@@ -4754,56 +4822,56 @@ msgstr "używając konta %s"
 #. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:869
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
 #. disco
-#: ../src/roster_window.py:874
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:948
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:968
+#: ../src/roster_window.py:1003
 msgid "_Manage Bookmarks..."
 msgstr "_Zarządzaj zakładkami..."
 
-#: ../src/roster_window.py:997
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
 #. History manager
-#: ../src/roster_window.py:1018
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Menedżer historii rozmów"
 
-#: ../src/roster_window.py:1027
+#: ../src/roster_window.py:1062
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: ../src/roster_window.py:1343 ../src/roster_window.py:3141
-#: ../src/roster_window.py:3147
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:1344
+#: ../src/roster_window.py:1385
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: ../src/roster_window.py:1347
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:1348
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4811,11 +4879,11 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "tego transportu."
 
-#: ../src/roster_window.py:1350
+#: ../src/roster_window.py:1392
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: ../src/roster_window.py:1355
+#: ../src/roster_window.py:1397
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4824,85 +4892,121 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "następujących transportów: %s"
 
-#: ../src/roster_window.py:1399
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Konflikt nazw użytkownika"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Wpisz hasło GPG dla konta %s."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Zmień nazwę"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Wpisz hasło GPG dla konta %s."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Usuń"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Usuwa kontakt z listy kontaktów"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:1657 ../src/roster_window.py:1832
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 msgid "_New group chat"
 msgstr "_Nowa rozmowa grupowa"
 
-#: ../src/roster_window.py:1715
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
-#: ../src/roster_window.py:1877 ../src/roster_window.py:1916
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: ../src/roster_window.py:1903
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "_Zmień nazwę"
 
-#: ../src/roster_window.py:1922
+#: ../src/roster_window.py:2061
 msgid "To all users"
 msgstr "Do wszystkoch użytkowników"
 
-#: ../src/roster_window.py:1925
+#: ../src/roster_window.py:2064
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Połącz"
 
-#: ../src/roster_window.py:1971
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "R_ozłącz"
 
-#: ../src/roster_window.py:2079 ../src/roster_window.py:2141
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Zmień Opis Statusu"
 
-#: ../src/roster_window.py:2211
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:2212
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2401
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej "
 "status."
 
-#: ../src/roster_window.py:2248
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2414
 #, 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:2456
+#: ../src/roster_window.py:2617
 #, 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:2460
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4910,7 +5014,7 @@ 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:2464
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4918,16 +5022,16 @@ msgstr ""
 "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako rozłączonego."
 
-#: ../src/roster_window.py:2465
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Chcę żeby po usunięciu ten kontakt znał mój status"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2469
+#: ../src/roster_window.py:2633
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty zostaną usunięte z twojej listy kontaktów"
 
-#: ../src/roster_window.py:2473
+#: ../src/roster_window.py:2637
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4937,32 +5041,33 @@ msgstr ""
 "cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
 "jako rozłączony."
 
-#: ../src/roster_window.py:2542
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/roster_window.py:2543
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Wpisz hasło GPG dla konta %s."
 
-#: ../src/roster_window.py:2548
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Zapisz hasło"
 
-#: ../src/roster_window.py:2556
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Błędne hasło"
 
-#: ../src/roster_window.py:2557
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
+msgstr ""
+"Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
 
-#: ../src/roster_window.py:2610 ../src/roster_window.py:2669
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:2611 ../src/roster_window.py:2670
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4970,20 +5075,20 @@ msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:2627
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:2628
+#: ../src/roster_window.py:2800
 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:2723
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr "♪ \"%(title)s\" w wykonaniu %(artist)s ♪"
 
-#: ../src/roster_window.py:3142 ../src/roster_window.py:3148
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4991,11 +5096,11 @@ msgstr ""
 "Wiadomości będą dostępne tylko do czytania, o ile masz włączoną obsługę "
 "historii."
 
-#: ../src/roster_window.py:3778
+#: ../src/roster_window.py:3911
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: ../src/roster_window.py:3778
+#: ../src/roster_window.py:3913
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
@@ -5003,12 +5108,12 @@ msgstr ""
 "Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie "
 "zostanie przywrócona podczas następnego połączenia."
 
-#: ../src/roster_window.py:3819
+#: ../src/roster_window.py:3955
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: ../src/roster_window.py:3820
+#: ../src/roster_window.py:3957
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generaly it "
 "is used when the same person has several Jabber accounts or transport "
@@ -5018,106 +5123,110 @@ msgstr ""
 "rostera. Używa się ich przede wszystkim wtedy, gdy jedna osoba ma kilka kont "
 "Jabbera lub zarejestrowana jest w kilku transportach."
 
-#: ../src/roster_window.py:3994
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Usuń %s z grupy %s"
 
-#: ../src/roster_window.py:4001
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Przekształć %s oraz %s w metakontakty"
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Zmień Opis Statusu..."
 
-#: ../src/systray.py:142
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Zmień Opis Statusu..."
 
-#: ../src/tooltips.py:310
-msgid "JID: "
-msgstr "JID: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Ukryj to menu"
 
-#: ../src/tooltips.py:313 ../src/tooltips.py:497
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
+
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Zasoby: "
 
-#: ../src/tooltips.py:318
+#: ../src/tooltips.py:317
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s tego pokoju"
 
-#: ../src/tooltips.py:431 ../src/tooltips.py:611
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:462
+#: ../src/tooltips.py:461
 #, python-format
 msgid "Last status: %s"
 msgstr "Ostatni status %s"
 
-#: ../src/tooltips.py:464
+#: ../src/tooltips.py:463
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:493
-msgid "Jabber ID: "
-msgstr "Jabber ID:"
-
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Subscription: "
 msgstr "Autoryzacja: "
 
-#: ../src/tooltips.py:513
+#: ../src/tooltips.py:512
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Pobieranie"
 
-#: ../src/tooltips.py:573
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Prześlij"
 
-#: ../src/tooltips.py:580
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:586
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Przesłane: "
 
-#: ../src/tooltips.py:589 ../src/tooltips.py:610
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Nie włączony"
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../src/tooltips.py:595 ../src/tooltips.py:598
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Ukończony"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Wygaszony"
 
-#: ../src/tooltips.py:608
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Przesyłanie"
 
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:639
 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:643
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5125,24 +5234,24 @@ msgstr ""
 "Ta usługa nie była w stanie odesłać szczegółowych informacji.\n"
 "Prawdopodobnie została zamknięta lub jest zepsuta"
 
-#: ../src/vcard.py:215
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:245 ../src/vcard.py:447
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:277
 msgid "Affiliation:"
 msgstr "Afiliacja: "
 
-#: ../src/vcard.py:283
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5150,7 +5259,7 @@ msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
 "interesujesz się jego/jej statusem."
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5158,12 +5267,12 @@ msgstr ""
 "Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
 "jest zainteresowana twoim."
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:289
 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:289
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5171,11 +5280,11 @@ msgstr ""
 "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
 "jest zainteresowany twoim"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:299
 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:309 ../src/vcard.py:336 ../src/vcard.py:480
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
@@ -5352,7 +5461,18 @@ msgstr ""
 "synchronizują się ze statusem globalnym) w oparciu o status wykorzystywanego "
 "połączenia sieciowego."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -5361,11 +5481,11 @@ msgstr ""
 "(print_time==sometimes), zmienna określa co ile minut Gajim ma wyświetlać "
 "czas nadejścia nowej wiadomości."
 
-#: ../src/common/config.py:158
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5374,7 +5494,7 @@ msgstr ""
 "na każdym z pokojów wymienionych na liście (nazwy pokojów rozdzielone "
 "spacją)."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:161
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5383,7 +5503,7 @@ msgstr ""
 "prowadzona jest na dowolnym pokoju obecnym na tej liście (nazwy pokojów "
 "rozdzielone spacją)."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5391,34 +5511,34 @@ msgstr ""
 "Nadpisuje host, który wysyłamy w celu przesyłania plików, w przypadku "
 "tłumaczenia adresu/przekierowania portu."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:166
 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:167
+#: ../src/common/config.py:168
 msgid "Notify of events in the system trayicon."
 msgstr "Powiadamiaj o zdarzeniach za pomocą ikony w obszarze powiadamiania."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Czy pokazywać kartę gdy otwarta jest tylko jedna rozmowa?"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Czy pokazywać rozgraniczenie kart w oknie czatu?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:189
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista słów oddzielonych średnikami, które będą podświetlane w trakcie "
 "rozmowy w pokoju."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5427,13 +5547,13 @@ msgstr ""
 "Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
 "systemowa."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr ""
 "Jeśli ma wartość True, Gajim rejestruje się przy każdym starcie jako klient "
 "xmpp://."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5442,7 +5562,7 @@ msgstr ""
 "nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
 "motywu."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:193
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -5450,7 +5570,7 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyświetli opis statusu, jeśli nie jest on "
 "pusty, dla każdego kontaktu pod jego nazwą w oknie listy kontaktów."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:195
 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."
@@ -5458,7 +5578,7 @@ 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:195
+#: ../src/common/config.py:196
 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."
@@ -5466,7 +5586,7 @@ 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:196
+#: ../src/common/config.py:197
 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 "
@@ -5482,21 +5602,29 @@ msgstr ""
 "użytkownika do pokoju lub jego opuszczeniu."
 
 #: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Jeżeli opcja ustawiona jest na True, przywrócone wiadomości będą wyświetlane "
 "mniejszą czcionką."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pokazuj awatarów transportów."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr "Nie pokazuj okna rostera na pasku zadań."
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:205
 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 "
@@ -5506,7 +5634,7 @@ msgstr ""
 "niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie "
 "okna programu."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:207
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -5517,7 +5645,7 @@ msgstr ""
 "wysyłania takiej informacji."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:207
+#: ../src/common/config.py:210
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5535,39 +5663,39 @@ msgstr ""
 "wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie "
 "uruchomić program."
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:211
 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:209
+#: ../src/common/config.py:212
 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:210
+#: ../src/common/config.py:213
 msgid "Hides the buttons in group chat window."
 msgstr "Ukrywa przyciski w oknie czatu."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:214
 msgid "Hides the buttons in two persons chat window."
 msgstr "Ukrywa przyciski podczas rozmowy dwóch osób."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Ukrywa banner w oknie czatu"
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Usuwa banner podczas rozmowy dwóch osób"
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:217
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Usuwa z okna rozmowy grupowej listę osób obecnych w pokoju."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:218
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -5575,22 +5703,22 @@ msgstr ""
 "Podczas rozmowy grupowej, pokaż nazwę rozmówcy na początku linii tylko "
 "wówczas, gdy poprzednią wiadomość wysłała inna osoba."
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr "Wcięcie stosowane przy łaczeniu tych samych nicków."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:220
 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:218
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Kombinacja klawiszy Ctrl-Tab przechodzi do następnej karty, o ile w żadnej z "
 "nich nie ma nieprzeczytanych wiadomości."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:222
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -5598,7 +5726,14 @@ msgstr ""
 "Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
 "Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -5607,11 +5742,11 @@ msgstr ""
 "zdefiniowane są opcjach rozpoczynających się od autopriority_*."
 
 #. yes, no, ask
-#: ../src/common/config.py:259
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Obejście dla Jabberd2"
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5619,101 +5754,101 @@ 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:322
+#: ../src/common/config.py:326
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
 
-#: ../src/common/config.py:323 ../src/common/config.py:326
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr "Język, którego używa słownik przy sprawdzaniu pisowni"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr "all lub komunikaty stanu rozdzielone spacjami"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:337
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' lub 'both'"
 
-#: ../src/common/config.py:334 ../src/common/config.py:336
-#: ../src/common/config.py:337 ../src/common/config.py:340
-#: ../src/common/config.py:341
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' lub \""
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: ../src/common/config.py:351
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:351
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:357
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:361
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:362
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:364
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: ../src/common/config.py:361
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/config.py:362 ../src/common/config.py:363
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: ../src/common/config.py:372
+#: ../src/common/config.py:376
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -5722,130 +5857,38 @@ msgstr ""
 "wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
 "będzie twój pseudonim."
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:377
 msgid "Sound to play when any MUC message arrives."
 msgstr "Dźwięk, jaki będzie odtwarzany, gdy nadejdzie wiadomość MUC."
 
-#: ../src/common/config.py:381 ../src/common/optparser.py:195
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:385 ../src/common/optparser.py:181
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:389
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:393
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "morski"
 
-#: ../src/common/connection.py:164
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Połączenie z kontem \"%s\"zostało zerwane."
-
-#: ../src/common/connection.py:165
-msgid "Reconnect manually."
-msgstr "Połącz ponownie ręcznie."
-
-#: ../src/common/connection.py:177 ../src/common/connection.py:203
-#, 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:202
-msgid "Invalid answer"
-msgstr "Niepoprawna odpowiedź"
-
-#: ../src/common/connection.py:390 ../src/common/connection.py:425
-#: ../src/common/connection.py:866
-#: ../src/common/zeroconf/connection_zeroconf.py:220
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Nie można połączyć się z \"%s\""
-
-#: ../src/common/connection.py:404
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Połączony z serwerem %s: %s z %s"
-
-#: ../src/common/connection.py:426
-msgid "Check your connection or try again later"
-msgstr "Sprawdź swoje połączenie lub spróbuj później"
-
-#: ../src/common/connection.py:451
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Autoryzacja z \"%s\" nie powiodła się"
-
-#: ../src/common/connection.py:452
-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:569
-#: ../src/common/zeroconf/connection_zeroconf.py:159
-msgid "OpenPGP passphrase was not given"
-msgstr "Nie podano klucza OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/connection.py:571
-#: ../src/common/zeroconf/connection_zeroconf.py:161
-#, 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:611
-msgid "invisible"
-msgstr "niewidoczny"
-
-#: ../src/common/connection.py:612
-msgid "offline"
-msgstr "rozłączony"
-
-#: ../src/common/connection.py:613
-#, python-format
-msgid "I'm %s"
-msgstr "Jestem %s"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:704
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Ta wiadomość jest zaszyfrowana (zobacz JEP '27']"
-
-#: ../src/common/connection.py:753
-#: ../src/common/zeroconf/connection_zeroconf.py:400
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Temat: %s\n"
-"%s"
-
-#: ../src/common/connection.py:890
-msgid "Not fetched because of invisible status"
-msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
-
-#: ../src/common/connection_handlers.py:49
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:47
+#: ../src/common/connection_handlers.py:52
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 msgid "Unable to load idle module"
 msgstr "Nie można załadować modułu idle"
 
-#: ../src/common/connection_handlers.py:174
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:147
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid "Wrong host"
 msgstr "Błędna nazwa hosta"
 
-#: ../src/common/connection_handlers.py:174
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:147
+#: ../src/common/connection_handlers.py:177
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5853,12 +5896,12 @@ msgstr ""
 "Nazwa hosta, którą określiłeś w opcji ft_overhide_host_to_send jest "
 "niepoprawna, będzie więc ignorowana."
 
-#: ../src/common/connection_handlers.py:587
+#: ../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:1467
+#: ../src/common/connection_handlers.py:1519
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Pseudonim jest niedozwolony: %s"
@@ -5866,41 +5909,41 @@ msgstr "Pseudonim jest niedozwolony: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1529
-#: ../src/common/connection_handlers.py:1532
-#: ../src/common/connection_handlers.py:1535
-#: ../src/common/connection_handlers.py:1538
-#: ../src/common/connection_handlers.py:1541
-#: ../src/common/connection_handlers.py:1544
-#: ../src/common/connection_handlers.py:1552
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
 msgid "Unable to join group chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: ../src/common/connection_handlers.py:1530
+#: ../src/common/connection_handlers.py:1582
 msgid "A password is required to join this group chat."
 msgstr "Aby dołączyć do tego pokoju, wymagane jest hasło."
 
-#: ../src/common/connection_handlers.py:1533
+#: ../src/common/connection_handlers.py:1585
 msgid "You are banned from this group chat."
 msgstr "Zostałeś zabanowany w tym pokoju."
 
-#: ../src/common/connection_handlers.py:1536
+#: ../src/common/connection_handlers.py:1588
 msgid "Such group chat does not exist."
 msgstr "Taki pokój nie istnieje."
 
-#: ../src/common/connection_handlers.py:1539
+#: ../src/common/connection_handlers.py:1591
 msgid "Group chat creation is restricted."
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: ../src/common/connection_handlers.py:1542
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Twój zarejestrowany pseudonim musi być w użyciu."
 
-#: ../src/common/connection_handlers.py:1545
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Nie jesteś na liście członków."
 
-#: ../src/common/connection_handlers.py:1553
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5909,27 +5952,27 @@ msgstr ""
 "innego.\n"
 "Podaj inny pseudonim:"
 
-#: ../src/common/connection_handlers.py:1599
+#: ../src/common/connection_handlers.py:1651
 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:1620
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Zapisaliśmy się do %s"
 
-#: ../src/common/connection_handlers.py:1622
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: ../src/common/connection_handlers.py:1624
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Wypisaliśmy się z %s"
 
-#: ../src/common/connection_handlers.py:1794
+#: ../src/common/connection_handlers.py:1846
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5939,12 +5982,104 @@ msgstr ""
 "Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru."
 "jabberstudio.org/ aby go usunąć"
 
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Połączenie z kontem \"%s\"zostało zerwane."
+
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
+msgstr "Połącz ponownie ręcznie."
+
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr "Transport %s udzielił nieprawidłowej odpowiedzi na żądnie rejestracji."
+
+#. wrong answer
+#: ../src/common/connection.py:202
+msgid "Invalid answer"
+msgstr "Niepoprawna odpowiedź"
+
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
+#: ../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:408
+#, python-format
+msgid "Connected to server %s:%s with %s"
+msgstr "Połączony z serwerem %s: %s z %s"
+
+#: ../src/common/connection.py:430
+msgid "Check your connection or try again later"
+msgstr "Sprawdź swoje połączenie lub spróbuj później"
+
+#: ../src/common/connection.py:455
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Autoryzacja z \"%s\" nie powiodła się"
+
+#: ../src/common/connection.py:456
+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/zeroconf/connection_zeroconf.py:156
+msgid "OpenPGP passphrase was not given"
+msgstr "Nie podano klucza OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
+#, 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:615
+msgid "invisible"
+msgstr "niewidoczny"
+
+#: ../src/common/connection.py:616
+msgid "offline"
+msgstr "rozłączony"
+
+#: ../src/common/connection.py:617
+#, python-format
+msgid "I'm %s"
+msgstr "Jestem %s"
+
+#. we're not english
+#. one  in locale and one en
+#: ../src/common/connection.py:708
+msgid "[This message is *encrypted* (See :JEP:`27`]"
+msgstr "[Ta wiadomość jest zaszyfrowana (zobacz JEP '27']"
+
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
+#, python-format
+msgid ""
+"Subject: %s\n"
+"%s"
+msgstr ""
+"Temat: %s\n"
+"%s"
+
+#: ../src/common/connection.py:897
+msgid "Not fetched because of invisible status"
+msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
+
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Na tym komputerze brakuje pythonowych dowiązań do D-Bus."
 
-#: ../src/common/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Nie można użyć D-Bus."
 
@@ -6023,6 +6158,7 @@ msgstr "dwunastej"
 #. 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
+#, fuzzy, python-format
 msgid "%0 o'clock"
 msgstr "Godzina %0"
 
@@ -6122,210 +6258,210 @@ msgstr "Koniec tygodnia"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Wymagany adres serwera."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s·GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s·GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s·MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s·MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s·KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s·KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s·B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Dostępny"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Do"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Obustronna"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Goście"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Gość"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Powiązanie kontaktu z czata: brak"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 msgid "Owner"
 msgstr "Właściciel"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 msgid "Member"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
-#: ../src/common/helpers.py:877
+#: ../src/common/helpers.py:880
 #, python-format
 msgid " %d unread message"
 msgid_plural " %d unread messages"
@@ -6333,7 +6469,7 @@ msgstr[0] "%d nieprzeczytana wiadomość"
 msgstr[1] "%d nieprzeczytane wiadomości"
 msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
 
-#: ../src/common/helpers.py:883
+#: ../src/common/helpers.py:886
 #, python-format
 msgid " %d unread single message"
 msgid_plural " %d unread single messages"
@@ -6341,7 +6477,7 @@ msgstr[0] "%d nieprzeczytana wiadomość"
 msgstr[1] "%d nieprzeczytane wiadomości"
 msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
 
-#: ../src/common/helpers.py:889
+#: ../src/common/helpers.py:892
 #, python-format
 msgid " %d unread group chat message"
 msgid_plural " %d unread group chat messages"
@@ -6349,7 +6485,7 @@ 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:895
+#: ../src/common/helpers.py:898
 #, python-format
 msgid " %d unread private message"
 msgid_plural " %d unread private messages"
@@ -6357,7 +6493,7 @@ msgstr[0] "%d nieprzeczytana wiadomość prywatna"
 msgstr[1] "%d nieprzeczytane wiadomości prywatne"
 msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
 
-#: ../src/common/helpers.py:905 ../src/common/helpers.py:907
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6368,15 +6504,15 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/common/optparser.py:181
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:190 ../src/common/optparser.py:191
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "cyjan"
 
-#: ../src/common/optparser.py:300
+#: ../src/common/optparser.py:302
 msgid "migrating logs database to indeces"
 msgstr "indeksowanie archiwum rozmów"
 
@@ -6394,24 +6530,25 @@ msgstr "Nie można ustanowić połączenia z hostem. Nieprawidłowa odpowiedź."
 msgid "Connection to host could not be established"
 msgstr "Nie można ustanowić połączenia z hostem"
 
-#: ../src/common/zeroconf/client_zeroconf.py:335
+#: ../src/common/zeroconf/client_zeroconf.py:334
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
-msgstr "Nie można ustanowić połączenia z hostem. Timeout podczas wysyłania danych."
+msgstr ""
+"Nie można ustanowić połączenia z hostem. Timeout podczas wysyłania danych."
 
-#: ../src/common/zeroconf/client_zeroconf.py:630
+#: ../src/common/zeroconf/client_zeroconf.py:629
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt jest rozłączony. Twoja wiadomość nie mogła zostać wysłana."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:197
 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/zeroconf/connection_zeroconf.py:210
+#: ../src/common/zeroconf/connection_zeroconf.py:207
 msgid "Avahi error"
 msgstr "Błąd Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:210
+#: ../src/common/zeroconf/connection_zeroconf.py:207
 #, python-format
 msgid ""
 "%s\n"
@@ -6420,31 +6557,31 @@ msgstr ""
 "%s\n"
 "Przesyłanie wiadomości między adresami link-local może nie działać poprawnie."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr "Proszę sprawdzić czy zainstalowano Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:230
-#: ../src/common/zeroconf/connection_zeroconf.py:234
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 msgid "Could not start local service"
 msgstr "Nie można uruchomić usługi lokalnej"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:231
+#: ../src/common/zeroconf/connection_zeroconf.py:228
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie można podłączyć się do portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:235
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr "Proszę sprawdzić czy uruchomiony jest demon Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:327
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nie można zmienić statusu konta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:344
+#: ../src/common/zeroconf/connection_zeroconf.py:341
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -6453,15 +6590,18 @@ msgstr ""
 "mogła zostać wysłana."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:356
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/common/zeroconf/zeroconf.py:184
+#: ../src/common/zeroconf/zeroconf.py:180
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Błąd przy dodawaniu usługi %s"
 
+#~ msgid "JID: "
+#~ msgstr "JID: "
+
 #~ msgid "Merge consecutive nickname in chat window."
 #~ msgstr "Łącz następujące po sobie te same nicki w oknie czata."
 
@@ -6482,9 +6622,6 @@ msgstr "Błąd przy dodawaniu usługi %s"
 #~ "jest brana pod uwagę jedynie gdy zmienna notify_on_all_muc_messages ma "
 #~ "wartość True)"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Autoryzuj"
-
 #~ msgid "Add"
 #~ msgstr "Dodaj"
 
@@ -6539,9 +6676,6 @@ msgstr "Błąd przy dodawaniu usługi %s"
 #~ 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ść"
diff --git a/po/pt.po b/po/pt.po
index 22236d00c..887359852 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -42,22 +42,26 @@ msgid "_Discover Services..."
 msgstr "_Descobrir Recursos..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "C_hat"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modificar Conta..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir Compositor de Email"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "E_stado"
@@ -246,16 +250,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Geral"
 
@@ -314,17 +320,17 @@ msgid "Manage..."
 msgstr "Gerir..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Nenhum"
 
@@ -611,11 +617,11 @@ msgstr "Editor de Configuração Avançada"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Estado: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Ausente"
 
@@ -633,7 +639,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -643,21 +649,25 @@ msgid "Launch a command"
 msgstr "comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Indisponível"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Livre para conversar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -670,16 +680,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -739,7 +746,7 @@ msgid "for "
 msgstr "Porta:"
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -776,7 +783,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Adicionar à Lista"
 
@@ -799,7 +806,7 @@ msgstr "_Abrir Link no Navegador"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Iniciar Conversa"
 
@@ -808,7 +815,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Enviar _Ficheiro"
@@ -825,12 +832,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Histórico"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "Neste grupo"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Configuração da Sala"
 
@@ -921,11 +933,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr ""
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Count\n"
 "Grupo\n"
@@ -975,7 +988,7 @@ msgid ""
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Pausada"
 
@@ -1110,14 +1123,14 @@ msgstr "Negar"
 msgid "Invitation Received"
 msgstr "Convite Recebido"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Alcunha:"
 
@@ -1135,8 +1148,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1187,7 +1200,7 @@ msgstr "Gerir Perfis de Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1204,14 +1217,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Acções"
 
@@ -1313,10 +1326,12 @@ msgid "Auto _not available after:"
 msgstr "Marcar automaticamente como _indisponível depois de:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Auto-detectar a cada arranque da aplicação\n"
@@ -1324,19 +1339,15 @@ msgstr ""
 "Usar sempre aplicações KDE padrão\n"
 "Personalizar"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 #, fuzzy
 msgid "B_efore nickname:"
 msgstr "Antes da alcunha:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../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:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1348,44 +1359,63 @@ msgstr ""
 "de qualquer contacto que não estiver na sua lista."
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Mensagem de Estado"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 #, fuzzy
 msgid "Default status _iconset:"
 msgstr "Iconset de _estados padrão:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Exibir mensagens de estado dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Noti_ficação do estado da conversa:"
+
+#: ../data/glade/preferences_window.glade.h:39
 #, fuzzy
 msgid "E_very 5 minutes"
 msgstr "De 5 em 5 _minutos"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Gerir Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Eventos"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+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:43
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1395,7 +1425,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:41
+#: ../data/glade/preferences_window.glade.h:44
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -1403,7 +1433,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:42
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -1412,7 +1442,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:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1420,7 +1450,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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1428,19 +1458,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:45
+#: ../data/glade/preferences_window.glade.h:48
 #, 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -1449,7 +1479,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1458,7 +1488,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:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1466,7 +1496,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1476,7 +1506,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:52
+#: ../data/glade/preferences_window.glade.h:55
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -1485,12 +1515,16 @@ msgstr ""
 "Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
 "gráficos equivalentes."
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Gerir..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1498,87 +1532,98 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "Em todas as _mensagens"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 #, fuzzy
 msgid "One message _window:"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Noti_ficação do estado da conversa:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Mostrar hora:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Mostrar apenas na _lista"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "_Ligar"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "_Desligar"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "A mensagem de estado auto-ausente"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "A mensagem de estado auto-indisponível"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Usar iconsets de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 #, 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:77
+#: ../data/glade/preferences_window.glade.h:83
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -1591,106 +1636,112 @@ 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:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Quando um novo evento é recebido"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Editor de Configuração Avançada"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 #, fuzzy
 msgid "_After time:"
 msgstr "Depois da hora:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "_Before time:"
 msgstr "Antes da hora:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "_File manager:"
 msgstr "Gestor de ficheiros:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "_Font:"
 msgstr "Letra:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal soletradas"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Mensagem recebida:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "Cliente de e_mail:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Notificar-me"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Mensagem a enviar:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Tocador de som:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Mostrar a mensagem como pop-up"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Voltar às Cores Padrão"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Sort contacts by status"
 msgstr "Ordenar contactos por estados"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Status message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minutos"
 
@@ -1721,7 +1772,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "_Ligar ao arranque"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1739,7 +1790,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr ""
 
@@ -1807,116 +1858,116 @@ msgid "City:"
 msgstr "Cidade:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Empresa:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "País:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Departamento:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Complemento:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Nome Dado:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Página pessoal:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Nome do meio:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Mais"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Detalhes Pessoais..."
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefone:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Cargo:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 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
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Prefixo:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Função:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Estado:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Rua:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Sufixo:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Trabalho"
 
@@ -1958,47 +2009,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Enviar _Mensagem Simples"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Iniciar _Conversa"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, 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:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, 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:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Remover da Lista"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Subscrição"
 
@@ -2044,8 +2102,8 @@ msgstr "_Conteúdo"
 msgid "_Discover Services"
 msgstr "_Descobrir Recursos"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -2135,36 +2193,42 @@ msgid "_Send & Close"
 msgstr "E_nviar & Fechar"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Autorizar"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Pedido de Subscrição"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Autorizar"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Sons Wav"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Mostrar _Lista de Contactos"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Es_tado"
 
@@ -2177,38 +2241,43 @@ msgstr "Perguntar:"
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Comentário: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Contacto:"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "SO:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Estado:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Subscrição:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Histórico das Conversas"
@@ -2402,7 +2471,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2431,50 +2500,50 @@ msgstr "Uma ligação não está disponível"
 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:834
+#: ../src/chat_control.py:839
 #, fuzzy
 msgid "Chats"
 msgstr "Conversa"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(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:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Encriptação activada"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Encriptação desactivada"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2482,322 +2551,327 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Todos os %s _minutos"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, 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
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nome do Contacto"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto Entrou"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensagem"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Convite Recebido"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 #, 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:1289
+#: ../src/config.py:1337
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 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:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2807,92 +2881,102 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Apagar MOTD"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Mostrar hora:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: ../src/config.py:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 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:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 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:2963
+#: ../src/config.py:3040
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2901,23 +2985,23 @@ msgstr ""
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2925,254 +3009,263 @@ 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:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "Há %i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contacto <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Nome do Contacto"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensagem de Estado de %s"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Complemento:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "ID de Utilizador inválido"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 #, 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:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "ID do Utilizador:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "Um cliente Jabber GTK+"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossível entrar na sala"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, 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:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Já está na sala %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat com a conta %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:1185
-msgid "The room Jabber ID has not allowed characters."
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3182,260 +3275,270 @@ msgstr ""
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível escrever ficheiro em %s"
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto Saiu"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Descrição: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Nome de utilizador inválido"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
+#: ../src/dialogs.py:2220
 #, fuzzy, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Ligação"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Tem de estar ligado para ver os serviços"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviço usando conta %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3443,51 +3546,69 @@ 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:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Serviço não explorável"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "usando a conta %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 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:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Buscando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Utilizadores"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Subscrição"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Subscrever"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Subscrever"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Ficheiro"
@@ -3513,7 +3634,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Você"
 
@@ -3523,7 +3644,7 @@ msgid "Sender: %s"
 msgstr "Remetente: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Destinatário: "
 
@@ -3590,32 +3711,32 @@ msgstr "Descrição: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quer enviar-lhe um ficheiro:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3651,12 +3772,11 @@ msgstr "Ficheiro: "
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Remetente: "
 
@@ -3664,33 +3784,33 @@ msgstr "Remetente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim necesita do Xserver para ser executado. Saindo..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim necessita do PyGTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim necessita do GTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Falta suporte libglade para o runtime GTK+"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3699,7 +3819,7 @@ msgstr ""
 "Por favor remova o seu runtime GTK+ actual e instale a última versão estável "
 "de %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -3707,16 +3827,16 @@ msgstr ""
 "Por favor, certifique-se de que o GTK e o PyGTK têm suporte libglade no seu "
 "sistema."
 
-#: ../src/gajim.py:70
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necessita do PySQLite2 para ser executado"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necessita do PySQLite2 para ser executado"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3724,86 +3844,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorização para %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Ligação"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Assunto: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, fuzzy, python-format
 msgid "error while sending %s ( %s )"
 msgstr "erro ao enviar"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Vê-lo-á sempre como estando offline."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s está agora  %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3813,56 +3933,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Uma ligação não está disponível"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management não é suportado (módulo gnome.ui em falta)"
 
@@ -3885,7 +4010,8 @@ msgid "Shows or hides the roster window"
 msgstr "Mostra ou esconde a janela principal"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Abre uma janela com a próxima mensagem não lida"
 
 #: ../src/gajim-remote.py:82
@@ -4228,8 +4354,8 @@ msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Já não se encontra na sala \"%s\" ou \"%s\" saiu."
 
 #: ../src/groupchat_control.py:141
@@ -4247,98 +4373,99 @@ msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "Neste grupo"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s está agora %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Esta sala não tem assunto"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, 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:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Uso: /%s <alcunha|JID> [razão], bane o JID da sala. A alcunha de um ocupante "
 "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:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4346,12 +4473,12 @@ msgstr ""
 "Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4360,21 +4487,21 @@ msgstr ""
 "Uso: /%s [razão], fecha a janela ou aba actual, exibindo a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Uso: /%s <JID> [razão], convida o JID para a sala actual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4383,26 +4510,26 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/alcunha], convida a juntar-se a sala@servidor, "
 "usando opcionalmente uma alcunha especificada."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 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:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 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:1241
+#: ../src/groupchat_control.py:1246
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4411,92 +4538,94 @@ 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:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <alcunha>, muda a sua alcunha na sala actual."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, 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:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Não há informações de ajuda para /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Tem a certeza de que deseja sair da sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Se fechar esta janela, perder-se-á a ligação a esta sala."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Não voltar a perguntar"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Bookmark já está configurado"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos seus bookmarks."
 
-#: ../src/groupchat_control.py:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -4527,77 +4656,77 @@ msgstr "Detalhes"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar Ficheiro como..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "a criar base de dados dos logs"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 #, fuzzy
 msgid "Contacts"
 msgstr "Contacto:"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 #, fuzzy
 msgid "Nickname"
 msgstr "Alcunha:"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Mensagem"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 #, fuzzy
 msgid "Subject"
 msgstr "Assunto:"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:184
+#: ../src/history_manager.py:188
 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 "
@@ -4606,27 +4735,27 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
@@ -4657,12 +4786,12 @@ msgstr "O estado é agora: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
@@ -4702,47 +4831,47 @@ msgstr ""
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Convite Recebido"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4750,87 +4879,88 @@ msgstr ""
 "Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
 "mais tarde."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Não pode entrar numa sala quando está invisível"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "usando a conta %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "para conta %s"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "usando conta %s"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Gerir Bookmarks..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, 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
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:1262
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4838,12 +4968,12 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4852,72 +4982,122 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Contacto:"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Introduza a chave GPG para a conta %s"
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Renomear"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Introduza a chave GPG para a conta %s"
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Remover"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Remove o contacto da lista"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Nova Sala"
+msgid "_New group chat"
+msgstr "Chat"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Nova Mensagem"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "Utilizadores _Online"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Ligar"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Desligar"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -4926,7 +5106,7 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4934,17 +5114,17 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto saiba o meu estado depois da remoção"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4953,33 +5133,33 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:2411
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Guardar frase de acesso"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4987,131 +5167,154 @@ 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:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 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:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De %s na sala %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Estado..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Função: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Esconder este menú"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Filiação: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Iconset de _estados padrão:"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Versão %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Subscrição:"
+
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Não iniciada"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Parada"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Completa"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Interrompida"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 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:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5119,25 +5322,25 @@ msgstr ""
 "Este serviço/recurso não pôde responder com informações detalhadas.\n"
 "Provavelmente está legacy ou broken"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versão %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Filiação: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5145,7 +5348,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:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5153,133 +5356,133 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 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:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "a criar base de dados dos logs"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s é um ficheiro, mas deveria ser um directório"
 
-#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim irá agora sair"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s é um directório, mas deveria ser um ficheiro"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "a criar directório %s"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, 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:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Ausente por estar inactivo"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Indisponível por estar inactivo"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no título da lista de contactos?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5287,12 +5490,12 @@ msgstr ""
 "Número de linhas, da conversa anterior, a lembrar para quando uma janela/aba "
 "de conversa seja reaberta."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5300,11 +5503,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:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Número de linhas a guardar ao premir Ctrl+TeclaCIMA."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5313,35 +5516,54 @@ 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:151
+#: ../src/common/config.py:153
 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:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:160
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5349,32 +5571,36 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 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:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda da aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 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:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5382,11 +5608,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:187
+#: ../src/common/config.py:191
 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:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5394,7 +5620,7 @@ msgstr ""
 "Se Verdadeiro (True), Gajim mostrará um ícone em cada aba contendo mensagens "
 "não lidas. Dependendo do tema, este ícone poderá ser animado."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5403,7 +5629,7 @@ msgstr ""
 "Se Verdadeiro (True), Gajim exibirá a mensagem de estado, caso houver, de "
 "cada contacto debaixo do nome de cada um deles na lista"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5411,7 +5637,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:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5420,43 +5646,52 @@ 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:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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:201
+#: ../src/common/config.py:207
 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5467,216 +5702,228 @@ msgid ""
 "the changes will take effect."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:212
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat 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."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, por isso deixe-me uma mensagem"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "A trabalhar"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estou fora, fui apreciar a vida"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponível"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Livre para conversar"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Serviço não disponível"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 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: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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "marine"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Frase de acesso"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5687,49 +5934,54 @@ msgstr ""
 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
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "É necessária uma palavra-passe para esta sala."
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Está banido/a desta sala."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Tal sala não existe."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "Criação de salas encontra-se restrita."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "A sua alcunha registada tem de ser usada."
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Não está na lista de membros."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5737,27 +5989,27 @@ 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
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "pedido de remoção de subscrição por %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "já não estamos subscritos a %s"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5767,90 +6019,88 @@ msgstr ""
 "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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"Para continuar a enviar e receber mensagens, precisará de se reconectar."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
 #, python-format
-msgid "Transport %s answered wrongly to register request."
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Senha Inválida"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Ligado ao servidor %s:%s com %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Verifique a sua ligação ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 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:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "Invisível"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "Estou %s"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5859,16 +6109,16 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Bindings do python D-Bus estão em falta neste computador"
 
-#: ../src/common/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 
@@ -6054,242 +6304,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Caractere inválido no nome de utilizador"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Endereço de servidor necessário."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Caractere inválido no hostname."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Caractere inválido no recurso."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Indisponível"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Livre para conversar"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Livre para conversar"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Disponível"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Ligando"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "In_visível"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "Desconhecido"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "Contém erros"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "Nenhuma"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "Nenhum"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Subscrição"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Dono"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrador"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Membro"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atenção à conversa"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "está a fazer outra coisa qualquer"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "pausa na composição da mensagem"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6300,49 +6550,115 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr ""
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "a criar base de dados dos logs"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "para conta %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Ligação ao peer não pode ser estabelecida."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+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/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Impossível entrar na sala"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem é encriptada]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Subscrever"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "erro ao enviar"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Nova Sala"
+
+#~ msgid "Role: "
+#~ msgstr "Função: "
+
+#~ msgid "Affiliation: "
+#~ msgstr "Filiação: "
+
+#~ 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 ""
+#~ "Som a tocar quando uma mensagem de chat chegar. (Apenas aplicável se "
+#~ "notify_on_all_muc_messages estiver definido como Verdadeiro)"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6364,10 +6680,6 @@ msgstr "[Esta mensagem é encriptada]"
 #~ msgid "Not Available "
 #~ msgstr "Indisponível"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Apagar MOTD"
-
 #~ msgid "Contact _Info"
 #~ msgstr "_Infos do Contacto"
 
@@ -6401,9 +6713,6 @@ msgstr "[Esta mensagem é encriptada]"
 #~ 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"
@@ -6486,9 +6795,6 @@ msgstr "[Esta mensagem é encriptada]"
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "Se marcado, o Gajim terá também um ícone na área de notificação"
 
-#~ msgid "_Online Users"
-#~ msgstr "Utilizadores _Online"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Iniciar conversa com a conta %s"
@@ -6627,10 +6933,6 @@ msgstr "[Esta mensagem é encriptada]"
 #~ msgid "Chat with"
 #~ msgstr "Conversa com"
 
-#, fuzzy
-#~ msgid "Send New Message"
-#~ msgstr "Nova Mensagem"
-
 #~ msgid "as %s"
 #~ msgstr "como %s"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 467f9b22e..eabea1a02 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.81\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-04-14 23:41-0300\n"
 "Last-Translator: Alfredo Saldanha Jr. <junix@targetlinux.org>\n"
 "Language-Team: none\n"
@@ -44,22 +44,26 @@ msgid "_Discover Services..."
 msgstr "_Descubra Serviços..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Conferência"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Editar Conta..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir Cliente de E-mail"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
@@ -246,16 +250,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Geral"
 
@@ -317,17 +323,17 @@ msgid "Manage..."
 msgstr "Gerenciar..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Nenhum"
 
@@ -615,11 +621,11 @@ msgstr "Editor de Configurações Avançadas"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Status: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Afastado"
 
@@ -637,7 +643,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -647,21 +653,25 @@ msgid "Launch a command"
 msgstr "comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Não Disponível"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Livre para Conversa"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -674,16 +684,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -743,7 +750,7 @@ msgid "for "
 msgstr "Porta:"
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -777,7 +784,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Adicionar à  Lista"
 
@@ -800,7 +807,7 @@ msgstr "_Abrir link no Navegador"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Iniciar conversa"
 
@@ -809,7 +816,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Enviar _Arquivo"
@@ -826,12 +833,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Histórico"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "Neste grupo"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Configuração da Sala"
 
@@ -919,11 +931,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Aba Cores do Bate-papo</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Conta\n"
 "Grupo\n"
@@ -974,7 +987,7 @@ msgstr ""
 "MUC Direto\n"
 "Mensagens"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Pausa"
 
@@ -1114,14 +1127,14 @@ msgstr "Negar"
 msgid "Invitation Received"
 msgstr "Convite Recebido"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Apelido:"
 
@@ -1139,8 +1152,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Ingressar"
 
@@ -1192,7 +1205,7 @@ msgstr "Gerenciar Perfis de Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1208,14 +1221,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Ações"
 
@@ -1315,10 +1328,12 @@ msgid "Auto _not available after:"
 msgstr "Marcar como _afastado depois:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Auto-detectar no início do Gajim\n"
@@ -1326,18 +1341,14 @@ msgstr ""
 "Sempre usar aplicações padrão KDE\n"
 "Customizar"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "_Antes do apelido:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../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:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1350,39 +1361,59 @@ msgstr ""
 "uma mensagem"
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Mensagem de status"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "_Conjunto de Ícones de status padrão:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostrar a_vatar dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar _mensagem de status da lista de contato"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Noti_ficações do status da conversa:"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "De 5 _em 5 minutos"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Eventos"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim pode enviar e receber meta-informações relacionadas a conversação que "
+"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:43
 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 "
@@ -1392,13 +1423,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:41
+#: ../data/glade/preferences_window.glade.h:44
 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:42
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1406,7 +1437,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:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1414,7 +1445,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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1422,18 +1453,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:45
+#: ../data/glade/preferences_window.glade.h:48
 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1441,7 +1472,7 @@ msgstr ""
 "Se marcado, Gajim mostrará avatars dos contatos na janela da lista e na "
 "conferência"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1449,7 +1480,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:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1457,7 +1488,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1467,7 +1498,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:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1475,11 +1506,15 @@ 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:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "Gere_nciar..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1491,84 +1526,95 @@ msgstr ""
 "Por conta\n"
 "Por tipo"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Notifique-me sobre contatos ao: "
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Notificar nova mensagem do _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "Em todas as _mensagens"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "Uma _janela de mensagem"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Noti_ficações do status da conversa:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Imprimir tempo:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Mostre somente na _lista"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "_Conectar"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "A mensagem de status para o ausente automático"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "A mensagem de status para o afastado automático"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Usar conjunto de ícones de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 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:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1580,96 +1626,102 @@ 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:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Quando novo evento é recebido"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Editor de Configurações Avançadas"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_Depois da hora:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "A_ntes da hora:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Navegar:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Gerenciamento de arquivos:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "_Fonte:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "Mensagem _recebida:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Log mudanças de status dos contatos"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Cliente de email:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Notifique-me sobre isto"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "Mensagem _enviada:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Tocador de som:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Alerta visual"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "Voltar para as Cores _Padrões"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "_Ordena contatos pelo status"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "_Mensagem de status:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minutos"
 
@@ -1700,7 +1752,7 @@ msgstr ""
 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
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1718,7 +1770,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "Lista de Banidos"
@@ -1787,116 +1839,116 @@ msgid "City:"
 msgstr "Cidade:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Empresa:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "País:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Departamento:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Complemento:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Nome:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Homepage:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Nome do meio:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Mais"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Informações Pessoais"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefone:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Cargo:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 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
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Prefixo:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Função:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Estado:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Rua:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Sobrenome:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Trabalho"
 
@@ -1937,47 +1989,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Enviar _Mensagem Simples"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Iniciar conversa"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, 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:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, 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:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Remover da Lista"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Inscrição"
 
@@ -2023,8 +2082,8 @@ msgstr "_Índices"
 msgid "_Discover Services"
 msgstr "_Descubra Serviços"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -2114,36 +2173,42 @@ msgid "_Send & Close"
 msgstr "_Enviar & Fechar"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Autorizar"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Solicitação de Inscrição"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Autorizar"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Sons Wav"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos _Eventos Pendentes"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Mostre _Lista"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
@@ -2156,38 +2221,43 @@ msgstr "Perguntar:"
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Comentário: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Contatos"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "SO:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Inscrição:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Histórico de Conversação"
@@ -2381,7 +2451,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2410,49 +2480,49 @@ msgstr "Uma conexão não está disponível"
 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:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Conversas"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Criptografia habilitada"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Criptografia desabilitada"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, 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:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2460,96 +2530,101 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "A cada %s _minutos"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, 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
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Primeira Mensagem Recebida"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Nova Mensagem Recebida"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Contato Conectado"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Contato Desconectou"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Mensagem Enviada"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem Destacada de Conferência"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Mensagem de Conferência Recebida"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Convite Recebido"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar disconectado."
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Eventos não lidos"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 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:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2557,175 +2632,175 @@ msgstr ""
 "Este nome já está sendo usado por outra de suas contas. Por favor, escolha "
 "outro nome."
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido:"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 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:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Estou de volta."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Re-autenticar agora?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 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:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 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:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Seleção de Chave OpenPGP"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "Ler todos os eventos pendentes antes de remover esta conta."
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Você não tem uma conta ativa"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Lista de Banidos"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Lista de Membros"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Lista de Donos"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Lista de Administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Razão"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Lista"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Banindo..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2733,11 +2808,11 @@ msgstr ""
 "<b>Quem você quer banir?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Adicionando Membro..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2745,11 +2820,11 @@ msgstr ""
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Adicionando Proprietário..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2757,11 +2832,11 @@ msgstr ""
 "<b>Quem você quer tornar um dono?</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Adicionando Administrador..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2769,7 +2844,7 @@ msgstr ""
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2785,90 +2860,100 @@ 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:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Deletar"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Imprimir tempo:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Conferência"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Bookmark tem dados inválidos"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 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:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 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:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID Duplicado"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Esta conta já está configurada no Gajim."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2877,23 +2962,23 @@ msgstr ""
 "Avançado, ou mais tarde clicando em Contas no item de menu da janela "
 "principal."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2901,255 +2986,264 @@ 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:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Ações para \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "_Procura na Web por isto"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "%i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contato <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Nome do Contato"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Mensagem de status"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Salvar como a mensagem de status pré-configurada"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Por favor, escreva um nome para esta mensagem de status"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Complemento:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à  lista"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "ID do Usuário:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Desenvolvedores Passados:"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Desenvolvedores Passados:"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "AGRADECIMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br> e Juracy Filho <juracy@gmail.com>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossível ingressar na sala"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Solicitação de inscrição para conta %s de %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Você já está na sala %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID Inválido:"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "O nome da sala ou nome do servidor não é permitido alguns caracteres."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Esconder o banner na janela de conferência"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3159,258 +3253,268 @@ msgstr ""
 "enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, 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:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido:"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível gravar o arquivo em %s"
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar contectado para mudar sua senha"
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nova Mensagem"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Enviar Mensagem Privada"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Novo E-Mail"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Solicitação de Transferência de Arquivos"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Arquivos"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Transferência do Arquivo Completa"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Transferência do Arquivo Parada"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Convite para Conferência"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contato desconectou"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem simples com conta %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem simples com conta %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Descrição: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato da linha</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato da linha</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "ConversasPrivada"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Nome de usuário inválido"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Você deve entrar com uma senha para registrar uma nova conta."
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s lhe convidou para sala %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s chega:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adicionando Notificação Especial para %s"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Conexão"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 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:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviços usando conta %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Buscar Serviços"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3418,51 +3522,69 @@ 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:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Visualizando %s usando conta %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 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:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Buscando %d / %d"
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Usuários"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Inscrever"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Inscrever"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Inscrever"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Arquivo"
@@ -3488,7 +3610,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Você"
 
@@ -3498,7 +3620,7 @@ msgid "Sender: %s"
 msgstr "Remetente: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Destinatário: "
 
@@ -3565,31 +3687,31 @@ msgstr "Descrição: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "O que você quer fazer?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3625,12 +3747,11 @@ msgstr "Arquivo:"
 msgid "It is not possible to send empty files"
 msgstr "não é possível enviar arquivos vazios"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Remetente: "
 
@@ -3638,31 +3759,31 @@ msgstr "Remetente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim necessita do Xserver para rodar. Encerrando..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim necessita PyGTK 2.6 ou acima"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim necessita GTK 2.6 ou acima"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Não existe suporte para libglade no GTK+ runtime"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3671,23 +3792,23 @@ msgstr ""
 "Por favor remova seu GTK+ runtime atual e instale a última versão estável de "
 "%s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 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
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necessita de PySQLite2 para rodar"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necessita de PySQLite2 para rodar"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3695,86 +3816,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorização HTTP (%s) para %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Conexão"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Assunto: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "erro no envio %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Você sempre o verá como offline."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s agora está %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novo E-mail em %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3784,56 +3905,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Uma conexão não está disponível"
+
+#: ../src/gajim.py:2095
 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."
@@ -3858,7 +3984,8 @@ msgid "Shows or hides the roster window"
 msgstr "Mostrar ou esconder a janela principal"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Mostrar uma janela com a próxima mensagem não lida"
 
 #: ../src/gajim-remote.py:82
@@ -4190,8 +4317,8 @@ msgstr "Falha ao Enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Você não esta mais na sala \"%s\" ou \"%s\" saiu."
 
 #: ../src/groupchat_control.py:141
@@ -4208,99 +4335,100 @@ msgid "Insert Nickname"
 msgstr "Mudar _Apelido"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s  foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "Neste grupo"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s agora está %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Apelido não encontrado: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Esta sala não tem assunto"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, 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:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Uso: /%s <apelido|JID> [ razão ], JID banido da sala. O apelido de um "
 "ocupante pode ser substituído, mas se não conter \"@\". Se o JID estiver "
 "atualmente na sala, ele/ela será chutado também.  Não suporta espaços no "
 "apelido."
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4308,12 +4436,12 @@ msgstr ""
 "Uso: /%s <apelido>, abre uma janela de conferência privada para um ocupante "
 "específico."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, apaga o texto da janela."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4322,21 +4450,21 @@ msgstr ""
 "Uso: /%s [rasão], fecha a janela corrente ou a aba, mostrando a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, esconde os botões do bate-papo."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Uso: /%s <JID> [ razão ], convida JID à  sala atual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4345,26 +4473,26 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/apelido], oferece para entrar na sala@servidor "
 "opcionalmente usando um apelido específico."
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 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:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "Uso: /%s <ação>, emite a ação à  sala atual. Use a terceira pessoa (por "
 "exemplo: /%s explodes.)"
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4373,92 +4501,94 @@ msgstr ""
 "Uso: /%s <apelido> [mensagem], abre uma janela de mensagem privada e envia "
 "uma mensagem ao ocupante especificado pelo apelido."
 
-#: ../src/groupchat_control.py:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <apelido>, muda seu apelido na sala corrente."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s [tópico], mostra ou atualiza o tópico da sala atual."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tópico], mostra ou atualiza o tópico da sala atual."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, 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:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Sem ajuda para /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Você tem certeza que quer deixar a sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Se você fechar esta janela, você será desconectado desta sala."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Não me pergunte novamente"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Mudando Assunto"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Mudando Apelido"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 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:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Bookmark já configurado"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos bookmarks."
 
-#: ../src/groupchat_control.py:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -4487,68 +4617,68 @@ msgstr "Detalhes"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salvar Arquivo como..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 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:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Contatos"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Apelido"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Mensagem"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4556,7 +4686,7 @@ msgstr ""
 "Você quer limpar o banco de dados? (ALTAMENTE NÃO RECOMENDADO COM O GAJIM EM "
 "EXECUÇÃO)"
 
-#: ../src/history_manager.py:184
+#: ../src/history_manager.py:188
 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 "
@@ -4570,26 +4700,26 @@ msgstr ""
 "\n"
 "Se caso você clicou SIM, por favor espere... "
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Exportando Histórico de Logs..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, 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:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Esta é uma operação irreversível."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 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?"
@@ -4620,11 +4750,11 @@ msgstr "Status agora é: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Mensagens"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4664,144 +4794,145 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem de %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Convite Recebido"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "Publicação do vCard falhou"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 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
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observadores"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Você não pode ingressar em uma sala enquanto está invisível"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "usando conta %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Gerenciar Bookmarks..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Gerenciador de Histórico"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, 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
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, 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:1262
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 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:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4809,72 +4940,122 @@ msgid ""
 msgstr ""
 "Você não poderá enviar e receber mensagens para contatos deste transporte"
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Contatos"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Entre com a frase de acesso da chave GPG para conta %s"
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Renomear"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Entre com a frase de acesso da chave GPG para conta %s"
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Remover"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Remover contato da lista"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Nova Sala"
+msgid "_New group chat"
+msgstr "Conferência"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de adiciona-lo à  minha lista"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Nova Mensagem"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "Usuários C_onectados"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Status"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4882,7 +5063,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:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4890,17 +5071,17 @@ 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:2334
+#: ../src/roster_window.py:2629
 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"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4909,32 +5090,32 @@ 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
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, 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:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Salvar Frase de acesso"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso Errada"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 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:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4942,21 +5123,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:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4964,111 +5145,135 @@ msgstr ""
 "Mensagem somente estará disponível para leitura mais tarde se você tiver o "
 "histórico habilitado."
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Você deve configurar uma conta antes de poder conversar com outros contatos."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Derrubar %s no grupo %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Fazer %s e %s metacontatos"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Status..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Status..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Regra: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Esconder este menu"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Filiação: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Último status conectado %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "desde %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Inscrição: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
+
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Não iniciado"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Parado"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Completo"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Parado"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 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:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5076,25 +5281,25 @@ msgstr ""
 "Este serviço não poderia responder com informações detalhadas.\n"
 "É mais provável quebrado"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Filiação: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5102,7 +5307,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:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5110,13 +5315,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:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5124,122 +5329,122 @@ msgstr ""
 "Você não está interessado na presença do contato, e nenhum está interessado "
 "no seu"
 
-#: ../src/vcard.py:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "criando banco de dados de logs"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s é um arquivo, mas deveria ser um diretório"
 
-#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim sairá agora"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s é um diretório, mas deveria ser um arquivo"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "criando diretório %s"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, 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:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Afastado em conseqüência de estar inativo"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Não disponível em conseqüência de estar inativo"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Aproveite * /_ pares como caráteres possíveis do formato. "
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no arquivo de lista?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5247,12 +5452,12 @@ msgstr ""
 "Quantas linhas para lembrar da conversação precedente quando uma aba/janela "
 "de bate-papo for reaberto."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5260,11 +5465,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:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quantas linhas à armazenar para Ctrl+KeyUP."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5273,38 +5478,59 @@ 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:151
+#: ../src/common/config.py:153
 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:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 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:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Sempre perguntar antes de fechar um aba/janela neste espaço listas de salas "
 "separadas por jids."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 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:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5312,32 +5538,36 @@ 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:162
+#: ../src/common/config.py:166
 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:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando tiver apenas uma bate papo?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda da aba com apenas um bate papo?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Uma lista semicolon-separada das palavras que serão destacadas no bate-papo "
 "multi-user."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5345,11 +5575,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:187
+#: ../src/common/config.py:191
 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:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5357,7 +5587,7 @@ msgstr ""
 "Se verdadeiro, Gajim mostrará um ícone para cada aba contendo mensagens não "
 "lidas. Dependendo do tema, este ícone pode ser animado."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5366,7 +5596,7 @@ msgstr ""
 "Se verdadeiro, Gajim indicará a mensagem de status, se não, esvazía-a, para "
 "cada contato sob o nome do contato na janela da lista"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5374,7 +5604,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:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5383,29 +5613,37 @@ 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:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5415,18 +5653,19 @@ msgstr ""
 "faz a janela piscar (o comportamento padrão na maioria dos Gerenciadores de "
 "Janela) quando esperam eventos pendentes."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5445,68 +5684,83 @@ 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:205
+#: ../src/common/config.py:211
 #, 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:206
+#: ../src/common/config.py:212
 #, 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:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Esconder os botões na janela de conferência"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, 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:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Esconder o banner na janela de conferência"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Esconder o banner na janela de conversa para duas pessoas "
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "Esconder a lista dos ocupantes da sala na janela da conferência"
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 rodando"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5514,151 +5768,148 @@ 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:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponível"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Livre para Conversa"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Serviço não disponível"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 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: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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "mantimento"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "marinho"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Frase de acesso Errada"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5669,49 +5920,54 @@ msgstr ""
 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
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Impossível ingressar na sala"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "Uma senha é requerida para entrar nesta sala."
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Você está banido desta sala."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Tal sala não existe."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "A criação de sala é restrita."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Seu nickname registado deve ser usado."
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Você não está na lista de membros."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5719,27 +5975,27 @@ 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
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nós estamos agora inscritos para %s"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Remoção de Inscrição solicitada por %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, 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
+#: ../src/common/connection_handlers.py:1846
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5749,89 +6005,87 @@ msgstr ""
 "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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"Para continuar enviando e recebendo mensagens, você precisará reconectar."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Transporte %s respondido errado para registar o pedido."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Resposta inválida"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado ao servidor %s:%s com %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 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:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "invisível"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "desconectado"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, 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
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Esta mensagem está criptografada]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5840,16 +6094,16 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 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
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 
@@ -6038,242 +6292,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Caracter inválido no nome do usuário"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Endereço do servidor é requerido."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Caracter inválido no nome do host"
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Caracter inválido no recurso."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Não Disponível"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "Livre para _Conversa"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Livre para Conversa"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "Dis_ponível"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "_Afastado"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Invisível"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "?contato tem status:Com erros"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "?Inscrição existente:Nenhuma"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "?Pergunta (para Inscrição):Nenhuma"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "?Regra do Contato para Conversa em Grupo:Nenhuma"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Regra do Contato para Conversa em Grupo:Nenhuma"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "D_ono"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrador"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Membro"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "pausa na digitação da mensagem"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6284,50 +6538,116 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "ciano"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "criando banco de dados de logs"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "para conta %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Conexão ponto a ponto não pode ser estabelecida."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Para continuar enviando e recebendo mensagens, você precisará reconectar."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, 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
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Impossível ingressar na sala"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem está criptografada]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Inscrever"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "erro no envio %s ( %s )"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Nova Sala"
+
+#~ msgid "Role: "
+#~ msgstr "Regra: "
+
+#~ msgid "Affiliation: "
+#~ msgstr "Filiação: "
+
+#~ 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 ""
+#~ "Som para tocar quando qualquer mensagem MUC chegar. (este ajuste é feito "
+#~ "exame no cliente somente se os notify_on_all_muc_messages for verdadeiro)"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6349,10 +6669,6 @@ msgstr "[Esta mensagem está criptografada]"
 #~ msgid "Not Available "
 #~ msgstr "Não Disponível"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Deletar"
-
 #~ msgid "Contact _Info"
 #~ msgstr "_Informações de Contato"
 
@@ -6383,9 +6699,6 @@ msgstr "[Esta mensagem está criptografada]"
 #~ 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"
@@ -6470,9 +6783,6 @@ msgstr "[Esta mensagem está criptografada]"
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "Se marcado, o Gajim também terá um ícone de bandeja"
 
-#~ msgid "_Online Users"
-#~ msgstr "Usuários C_onectados"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Iniciar uma conferência com a conta %s"
@@ -6612,10 +6922,6 @@ msgstr "[Esta mensagem está criptografada]"
 #~ msgid "Chat with"
 #~ msgstr "Conversa com"
 
-#, fuzzy
-#~ msgid "Send New Message"
-#~ msgstr "Nova Mensagem"
-
 #~ msgid "as %s"
 #~ msgstr "como %s"
 
diff --git a/po/ru.po b/po/ru.po
index 5f7ee78de..c2bff6a60 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-22 16:21+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\n"
 "PO-Revision-Date: 2006-11-22 18:17+0300\n"
 "Last-Translator: Alex V. Myltsev <avm@altlinux.org>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -53,8 +53,8 @@ msgstr "_Просмотреть сервисы..."
 msgid "_Execute Command..."
 msgstr "В_ыполнить команду..."
 
-#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/roster_window.glade.h:16
 #: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Комната"
@@ -232,10 +232,10 @@ msgid ""
 "default if broadcasted by the server, and with this option enabled TLS will "
 "be disabled"
 msgstr ""
-"Если отмечено, то Gajim будет соединяться с портом 5223, на котором "
-"старые сервера обычно ожидают подключения по SSL. Заметьте, что Gajim "
-"использует TLS шифрование по умолчанию, если сервер предоставляет такую "
-"возможность, с этой же опцией TLS отключается"
+"Если отмечено, то Gajim будет соединяться с портом 5223, на котором старые "
+"сервера обычно ожидают подключения по SSL. Заметьте, что Gajim использует "
+"TLS шифрование по умолчанию, если сервер предоставляет такую возможность, с "
+"этой же опцией TLS отключается"
 
 #: ../data/glade/account_modification_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:4
@@ -256,17 +256,17 @@ msgstr "Редактировать личную информацию..."
 
 #: ../data/glade/account_modification_window.glade.h:14
 #: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
-#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:902
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
 #. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
 #: ../src/roster_window.py:342 ../src/roster_window.py:1211
-#: ../src/roster_window.py:1418 ../src/roster_window.py:2028
-#: ../src/roster_window.py:2070 ../src/common/contacts.py:278
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Общие"
 
@@ -328,16 +328,16 @@ msgid "Manage..."
 msgstr "Управление..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1610
-#: ../src/config.py:3403
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1192
-#: ../src/config.py:1197 ../src/config.py:1381 ../src/config.py:1600
-#: ../src/config.py:1609 ../src/config.py:1668 ../src/config.py:1742
-#: ../src/config.py:2613 ../src/config.py:3393 ../src/config.py:3402
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Нет"
@@ -530,42 +530,6 @@ msgstr "За_регистрироваться"
 msgid "_User ID:"
 msgstr "ID пользователя:"
 
-#: ../data/glade/adhoc_commands_window.glade.h:1
-msgid "<b>An error has occured:</b>"
-msgstr "<b>Произошла ошибка:</b>"
-
-#: ../data/glade/adhoc_commands_window.glade.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Выберите команду:</a>"
-
-#: ../data/glade/adhoc_commands_window.glade.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Специальные команды - Gajim"
-
-#: ../data/glade/adhoc_commands_window.glade.h:4
-msgid "Check once more"
-msgstr ""
-
-#: ../data/glade/adhoc_commands_window.glade.h:5
-msgid "Error description..."
-msgstr "Описание ошибки..."
-
-#: ../data/glade/adhoc_commands_window.glade.h:6
-msgid "Please wait while retrieving command list..."
-msgstr "Получаю список команд. Подождите..."
-
-#: ../data/glade/adhoc_commands_window.glade.h:7
-msgid "Please wait while the command is sending..."
-msgstr "Происходит отправка команды. Подождите..."
-
-#: ../data/glade/adhoc_commands_window.glade.h:8
-msgid "Please wait..."
-msgstr "Подождите..."
-
-#: ../data/glade/adhoc_commands_window.glade.h:9
-msgid "This jabber entity does not expose any commands."
-msgstr ""
-
 #: ../data/glade/advanced_configuration_window.glade.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Описание</b>"
@@ -668,7 +632,7 @@ msgid "All statuses"
 msgstr "Статус: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Ушел"
 
@@ -686,7 +650,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Невидимка"
 
@@ -696,7 +660,7 @@ msgid "Launch a command"
 msgstr "команда"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Недоступен"
 
@@ -795,46 +759,6 @@ msgstr "Порт: "
 msgid "when I'm in"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:3
-#, fuzzy
-msgid "Entry:"
-msgstr "Страна:"
-
-#: ../data/glade/atom_entry_window.glade.h:4
-#, fuzzy
-msgid "Feed name:"
-msgstr "имя тeмы"
-
-#: ../data/glade/atom_entry_window.glade.h:5
-#, fuzzy
-msgid "Last modified:"
-msgstr "Имя:"
-
-#: ../data/glade/atom_entry_window.glade.h:6
-#, fuzzy
-msgid "New entry received"
-msgstr "Когда получено новое сообытие"
-
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:9
-msgid "You have received new entry:"
-msgstr ""
-
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Изменить пароль"
@@ -920,7 +844,7 @@ msgstr "_Компактный вид    Alt-C"
 msgid "_History"
 msgstr "_История"
 
-#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
+#: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Заполните форму."
 
@@ -1052,8 +976,7 @@ msgstr "Курсив"
 msgid ""
 "MUC\n"
 "Messages"
-msgstr ""
-"Сообщения MUC"
+msgstr "Сообщения MUC"
 
 #: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
@@ -1063,14 +986,10 @@ msgstr ""
 "Адресованные\n"
 "сообщения MUC"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Приостановился"
 
-#: ../src/tooltips.py:601
-msgid "?transfer status:Paused"
-msgstr "Приостановлено"
-
 #: ../data/glade/gajim_themes_window.glade.h:18
 msgid "Text _color:"
 msgstr "Цвет _текста:"
@@ -1139,20 +1058,6 @@ msgstr "_Отправить личное сообщение"
 msgid "_Voice"
 msgstr "_Право говорить"
 
-#: ../data/glade/groups_post_window.glade.h:1
-msgid "Create new post"
-msgstr ""
-
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:257
-msgid "From"
-msgstr "От"
-
-#. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
-#: ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Тема"
-
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1314,14 +1219,14 @@ msgstr "Использовать аутентификацию"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Щелкните, чтобы вставить смайлик (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1096
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Действия"
 
@@ -1441,10 +1346,6 @@ msgid "Chat"
 msgstr "Чат"
 
 #: ../data/glade/preferences_window.glade.h:31
-msgid "Chat state noti_fications:"
-msgstr "_Уведомление об изменении состояния:"
-
-#: ../data/glade/preferences_window.glade.h:32
 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 "
@@ -1454,30 +1355,35 @@ msgstr ""
 "вас. Используйте с осторожностью, потому что это заблокирует все сообщения "
 "от контактов не из вашего ротера."
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:32
 msgid "Configure color and font of the interface"
 msgstr "Настроить цвет и шрифт интерфейса"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default Status Messages"
 msgstr "Автоматические статусные сообщения"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "_Иконки по умолчанию для статуса:"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показавать а_ватары для контактов в ростере"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Показать _сообщения о статусе контакта в ростере"
 
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "_Уведомление об изменении состояния:"
+
 #: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "Каждые 5 _минут"
@@ -1491,10 +1397,11 @@ msgid "Events"
 msgstr "События"
 
 #: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
 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."
+"display in chat windows."
 msgstr ""
 "Gajim может отсылать и получать метаданные относящиеся к беседе с контактом. "
 "Здесь вы можете указать какие состояние беседы клиент будет отсылать вашему "
@@ -1502,12 +1409,22 @@ msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:43
 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 может отсылать и получать метаданные относящиеся к беседе с контактом. "
+"Здесь вы можете указать какие состояние беседы клиент будет отсылать вашему "
+"респонденту."
+
+#: ../data/glade/preferences_window.glade.h:44
+msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 "Gajim будет автоматически показывать новые события поднимая соответствующее "
 "окно."
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1515,7 +1432,7 @@ msgstr ""
 "Gajim будет уведомлять вас о новых событиях с помощью сообщения в правом "
 "нижнем углу экрана"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1523,7 +1440,7 @@ msgstr ""
 "Gajim будет уведомлять вас о присоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1531,19 +1448,19 @@ msgstr ""
 "Gajim будет уведомлять вас о отсоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim будет лишь менять иконку у контакта, от которого пришло новое сообщение"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1551,7 +1468,7 @@ msgstr ""
 "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и "
 "в окнах комнат"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1559,13 +1476,13 @@ msgstr ""
 "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
 "его именем в окне ростера и в окнах комнат"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 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:53
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1575,7 +1492,7 @@ msgstr ""
 "(например: Контакты с MSN будут иметь соответствующие иконки msn для "
 "статусов в сети, ушел, занят и т.д....)"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1583,15 +1500,15 @@ msgstr ""
 "Если отмечено, то Gajim будет заменять текстовые смайлики, например ':)', их "
 "графическим или анимированным эквивалентом"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid "Ignore rich content in incoming messages"
 msgstr "Игнорировать форматирование во входящих сообщениях"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "_Управление..."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1603,89 +1520,94 @@ msgstr ""
 "По учетной записи\n"
 "По типу"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Уведомлять о контактах которые: "
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Notify on new _GMail email"
 msgstr "Сообщать о новых письмах в _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "В _каждой строке"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "Одно _окно сообщения:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "_Уведомление об изменении состояния:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Проигрывать _звук"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Выводить время:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Save _position and size for roster and chat windows"
 msgstr "Сохранить _положение и размер ростера и окон бесед"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr "Отображать в статусном сообщении название проигрываемого трека"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Показывать только в _ростере"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "В_ошли"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "В_ышли"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:75
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Статус"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Сообщение о статусе для авто-отошел"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Сообщение о статусе для авто-недоступен"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Использовать иконки для _транспортов"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr "Использовать системный шрифт"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Иконка в _трее (или в области уведомления)"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1697,11 +1619,11 @@ msgstr ""
 "что событие соответствующее новому сообщению, не происходит если вы уже "
 "беседуете с контактом"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Когда получено новое сообытие"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid ""
 "Works for Rhythmbox and Muine players. For more players, please visit http://"
 "trac.gajim.org/wiki/GajimAndMusicPlayer"
@@ -1709,95 +1631,99 @@ msgstr ""
 "Работает с проигрывателями Rhythmbox и Muine. О других проигрывателях см. "
 "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Расширенный редактор настроек"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "_После времени:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "_До времени:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Менеджер файлов:"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "Шри_фт:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "Выделять _слова с опечатками"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "_Входящее сообщение:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_История изменений статуса контактов"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_Почтовый клиент:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Никогда"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Сообщать об этом"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "_Открыть..."
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "_Исходящее сообщение:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Проигрыватель:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Вывести окно"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "_Вернуться к цветам по умолчанию"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "_Сортировать контакты по статусу"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "_Сообщение о статусе:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "минут"
 
+#: ../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 "<b>Добавить/изменить правило</b>"
@@ -1834,7 +1760,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Номер:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1836
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr "Список доступа"
 
@@ -1870,10 +1796,6 @@ msgstr "посылать мне свой статус"
 msgid "to view my status"
 msgstr "видеть мой статус"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
-msgid "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
@@ -2048,17 +1970,17 @@ msgstr "Назначить OpenPGP ключ"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1992
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Редактировать группы"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2127
+#: ../src/roster_window.py:2131
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:1950
+#: ../src/roster_window.py:1954
 msgid "In_vite to"
 msgstr "Пригласить в комнату"
 
@@ -2082,14 +2004,14 @@ msgstr "Запретить ему или ей видеть мой статус"
 
 #. Remove group
 #: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1944 ../src/roster_window.py:2041
-#: ../src/roster_window.py:2148
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Удалить из ростера"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2136
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "П_ереименовать"
 
@@ -2138,7 +2060,7 @@ msgid "_Discover Services"
 msgstr "_Просмотреть сервисы"
 
 #: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
-#: ../src/roster_window.py:2119
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Правка"
 
@@ -2227,21 +2149,22 @@ msgid "_Send & Close"
 msgstr "Отправить и _закрыть"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Авторизовать"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Авторизовать контакт (он будет видеть ваш статус)"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Запрос подписки"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Авторизовать"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Отклонить"
@@ -2490,7 +2413,7 @@ msgstr "Шведский"
 msgid "Chinese (Ch)"
 msgstr "Китайский"
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1492
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2525,43 +2448,44 @@ msgid "Chats"
 msgstr "Чаты"
 
 #: ../src/chat_control.py:1025
+#, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s из комнаты %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1110
+#: ../src/chat_control.py:1113
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не выдал OpenPGP ключ или вы не присвоили ему такового"
 
-#: ../src/chat_control.py:1235
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Шифрование включено"
 
-#: ../src/chat_control.py:1240
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Шифрование отключено"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1382 ../src/conversation_textview.py:487
-#: ../src/dialogs.py:629 ../src/gajim.py:687 ../src/gajim.py:688
-#: ../src/gajim.py:1027 ../src/roster_window.py:328
-#: ../src/roster_window.py:404 ../src/roster_window.py:1638
-#: ../src/roster_window.py:1819 ../src/roster_window.py:2393
-#: ../src/roster_window.py:2592 ../src/roster_window.py:2603
-#: ../src/roster_window.py:3825 ../src/roster_window.py:3827
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
 #: ../src/common/contacts.py:73 ../src/common/helpers.py:42
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Не в ростере"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вы получили новое сообщение от \"%s\""
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2569,7 +2493,7 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет утеряно."
 
-#: ../src/config.py:129 ../src/config.py:578
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Отключено"
 
@@ -2578,87 +2502,93 @@ msgstr "Отключено"
 msgid "Every %s _minutes"
 msgstr "Каждые %s _минут"
 
-#: ../src/config.py:347
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:355
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:668 ../src/gajim.py:2033
+#: ../src/config.py:678 ../src/gajim.py:2072
+#, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Нет словаря для языка %s"
 
-#: ../src/config.py:669 ../src/gajim.py:2034
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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:1012
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "заголовок сообщения сервера"
 
-#: ../src/config.py:1012
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "текст сообщения сервера"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Получено первое сообщение"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Получено следующее сообщение"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Контакт подключился"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Контакт отключился"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
 
-#: ../src/config.py:1052
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Вас упомянули в комнате"
 
-#: ../src/config.py:1053
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: ../src/config.py:1256
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Получено приглашение"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "Невозможно использовать OpenPGP"
 
-#: ../src/config.py:1302
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1303
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1306 ../src/config.py:1898
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Непросмотренные события"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1333
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для смены имени учетной записи необходимо просмотреть ожидающие события."
 
-#: ../src/config.py:1311
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:1312
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2666,175 +2596,176 @@ msgstr ""
 "Это имя уже используется в другой вашей учетной записи. Пожалуйста, выберите "
 "другое."
 
-#: ../src/config.py:1316 ../src/config.py:1320
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:1317
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:1321
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:1329 ../src/config.py:1335 ../src/config.py:1345
-#: ../src/config.py:3003
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/config.py:1336
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат \"имя_пользователя@сервер\"."
 
-#: ../src/config.py:1395
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:1396
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:1522 ../src/common/config.py:362
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Скоро буду."
 
-#: ../src/config.py:1532
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Переподключиться сейчас?"
 
-#: ../src/config.py:1533
+#: ../src/config.py:1559
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Если вы хотите чтобы изменения были применены немедленно, вы должны "
 "переподключиться."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1586
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
 
-#: ../src/config.py:1567 ../src/dialogs.py:1128 ../src/dialogs.py:1292
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
 #: ../src/disco.py:417 ../src/profile_window.py:307
 #: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: ../src/config.py:1568
+#: ../src/config.py:1594
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Чтобы отредактировать личную информацию, нужно подсоединиться к серверу."
 
-#: ../src/config.py:1572
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr "Сервер не поддерживает Vcard"
 
-#: ../src/config.py:1573
+#: ../src/config.py:1599
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не может хранить личную информацию."
 
-#: ../src/config.py:1597 ../src/config.py:3390
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:1598 ../src/config.py:3391
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Возникла проблема с получением вашего секретного ключа OpenPGP."
 
-#: ../src/config.py:1601 ../src/config.py:3394
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Выбор ключа OpenPGP"
 
-#: ../src/config.py:1602 ../src/config.py:3395
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой ключ OpenPGP"
 
 #. Name column
-#: ../src/config.py:1832 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1835
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/config.py:1899
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
 
-#: ../src/config.py:1936
+#: ../src/config.py:1962
+#, python-format
 msgid "You have opened chat in account %s"
 msgstr "У вас есть окна чата под учётной записью %s"
 
-#: ../src/config.py:1937
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
 
-#: ../src/config.py:1996
+#: ../src/config.py:2022
 msgid "Account Local already exists."
 msgstr "Учётная запись Local уже существует."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения."
 
-#: ../src/config.py:2229
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:2231
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
 #. list at the begining
-#: ../src/config.py:2303
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Черный список"
 
-#: ../src/config.py:2304
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Список участников"
 
-#: ../src/config.py:2305
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Список владельцев"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Список администрираторов"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2339 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2347
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2352
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Обязанность"
 
-#: ../src/config.py:2377
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Баню..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2379
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2842,11 +2773,11 @@ msgstr ""
 "<b>Кого вы хотите забанить?</b>\n"
 "\n"
 
-#: ../src/config.py:2381
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Добавляю участника..."
 
-#: ../src/config.py:2382
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2854,11 +2785,11 @@ msgstr ""
 "<b>Кого вы хотите сделать участником?</b>\n"
 "\n"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Добавляю владельца..."
 
-#: ../src/config.py:2385
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2866,11 +2797,11 @@ msgstr ""
 "<b>Кого вы хотите сделать владельцем?</b>\n"
 "\n"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Добавляю администратора..."
 
-#: ../src/config.py:2388
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2878,7 +2809,7 @@ msgstr ""
 "<b>Кого вы хотите сделать администратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2894,97 +2825,97 @@ msgstr ""
 "4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
 "domain/resource, так и адрес, содержащий этот поддомен)"
 
-#: ../src/config.py:2494
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2511 ../src/roster_window.py:2661
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: ../src/config.py:2512 ../src/roster_window.py:2662
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2513 ../src/roster_window.py:2663
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2527
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Учетная запись \"%s\" подключена к серверу"
 
-#: ../src/config.py:2528
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2612
+#: ../src/config.py:2638
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/config.py:2612
+#: ../src/config.py:2638
 msgid "?print_status:All"
 msgstr "Все"
 
-#: ../src/config.py:2613
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr "Только приход и уход"
 
-#: ../src/config.py:2683
+#: ../src/config.py:2709
 msgid "New Group Chat"
 msgstr "Новая комната"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2716
+#: ../src/config.py:2742
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Пожалуйста, удостоверьтесь, что заполнены поля с именем сервера и комнаты, "
 "либо удалите эту закладку."
 
-#: ../src/config.py:2978
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: ../src/config.py:2989 ../src/dialogs.py:1311
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: ../src/config.py:2990
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Необходимо ввести пароль для новой учетной записи."
 
-#: ../src/config.py:2994 ../src/dialogs.py:1316
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/config.py:2995 ../src/dialogs.py:1317
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля, должны быть одинаковы."
 
-#: ../src/config.py:3014
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Дублирующийся Jabber ID"
 
-#: ../src/config.py:3015
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Этот контакт уже настроен в Gajim."
 
-#: ../src/config.py:3032
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
 
-#: ../src/config.py:3033 ../src/config.py:3068
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2993,19 +2924,19 @@ msgstr ""
 "Вы можете настроить ее используя \n"
 "\"Настройка->Учетные записи\" из главного окна."
 
-#: ../src/config.py:3067
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Ваша новая учетная запись успешно создана"
 
-#: ../src/config.py:3085
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:3143
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:3144
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "У вас уже есть учетная запись с таким именем."
 
@@ -3018,6 +2949,7 @@ msgstr ""
 "заглядывали в эту комнату"
 
 #: ../src/conversation_textview.py:340
+#, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия для \"%s\""
 
@@ -3066,20 +2998,13 @@ msgstr "%i дней назад"
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#. form is single
-#: ../src/dataforms_widget.py:72
-msgid "This is result of query."
-msgstr "Вот результат запроса."
-
-#: ../src/dataforms_widget.py:78
-msgid "Edit items on the list"
-msgstr "Редактировать элементы списка"
-
 #: ../src/dialogs.py:59
+#, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Имя контакта: <i>%s</i>"
 
 #: ../src/dialogs.py:61
+#, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr ""
 
@@ -3148,11 +3073,11 @@ msgid "Please fill in the data of the contact you want to add"
 msgstr "Пожалуйста, заполните данные о контакте, который вы хотите добавить"
 
 #: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
-#: ../src/disco.py:1252 ../src/gajim.py:452 ../src/roster_window.py:267
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
 #: ../src/roster_window.py:325 ../src/roster_window.py:364
 #: ../src/roster_window.py:445 ../src/roster_window.py:477
-#: ../src/roster_window.py:479 ../src/roster_window.py:3821
-#: ../src/roster_window.py:3823 ../src/common/helpers.py:42
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Транспорты"
 
@@ -3236,6 +3161,7 @@ msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
 #: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы уже в комнате %s"
 
@@ -3248,257 +3174,264 @@ msgstr "Вы не можете зайти в комнату без подклю�
 msgid "Join Group Chat with account %s"
 msgstr "Войти в комнату с учетной записи %s"
 
-#: ../src/dialogs.py:1213
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 msgid "Invalid group chat Jabber ID"
 msgstr "Неверное имя комнаты"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:1220
+#: ../src/dialogs.py:1225
 msgid "This is not a group chat"
 msgstr "Это не комната"
 
-#: ../src/dialogs.py:1221
+#: ../src/dialogs.py:1226
+#, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не является именем комнаты."
 
-#: ../src/dialogs.py:1243
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Начать беседу с учетной записью %s"
 
-#: ../src/dialogs.py:1245
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Начать беседу"
 
-#: ../src/dialogs.py:1246
+#: ../src/dialogs.py:1251
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
-"Введите ник или ID пользователя, "
-"которому вы хотите отправить сообщение:"
+"Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1271 ../src/dialogs.py:1630 ../src/dialogs.py:1759
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Соединение невозможно"
 
-#: ../src/dialogs.py:1272 ../src/dialogs.py:1631 ../src/dialogs.py:1760
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Пожалуйста, удостоверьтесь, что вы подключены к \"%s\"."
 
-#: ../src/dialogs.py:1281 ../src/dialogs.py:1284
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 msgid "Invalid JID"
 msgstr "Неверный JID"
 
-#: ../src/dialogs.py:1284
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не понимаю адреса \"%s\"."
 
-#: ../src/dialogs.py:1293
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Чтобы изменить пароль, необходимо подсоединиться к серверу."
 
-#: ../src/dialogs.py:1312
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Вы должны ввести пароль."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1359 ../src/notify.py:211 ../src/notify.py:411
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Контакт в сети"
 
-#: ../src/dialogs.py:1361 ../src/notify.py:219 ../src/notify.py:413
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
 #. chat message
-#: ../src/dialogs.py:1363 ../src/notify.py:238 ../src/notify.py:415
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Новое сообщение"
 
 #. single message
-#: ../src/dialogs.py:1363 ../src/notify.py:223 ../src/notify.py:415
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Новое одиночное сообщение"
 
 #. private message
-#: ../src/dialogs.py:1364 ../src/notify.py:230 ../src/notify.py:416
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: ../src/dialogs.py:1364 ../src/gajim.py:1120 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Новое письмо"
 
-#: ../src/dialogs.py:1366 ../src/gajim.py:1261 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: ../src/dialogs.py:1368 ../src/gajim.py:1094 ../src/gajim.py:1237
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: ../src/dialogs.py:1370 ../src/gajim.py:1300 ../src/gajim.py:1322
-#: ../src/gajim.py:1339 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Передача файла завершена"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1303 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:992 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Приглашение в комнату"
 
-#: ../src/dialogs.py:1375 ../src/notify.py:203 ../src/notify.py:428
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 msgid "Contact Changed Status"
 msgstr "Контакт изменил статус"
 
-#: ../src/dialogs.py:1560
+#: ../src/dialogs.py:1565
+#, python-format
 msgid "Single Message using account %s"
 msgstr "Новое сообщение с учетной записи %s"
 
-#: ../src/dialogs.py:1562
+#: ../src/dialogs.py:1567
+#, python-format
 msgid "Single Message in account %s"
 msgstr "Новое сообщение для учетной записи %s"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Сообщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1567
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1590
+#: ../src/dialogs.py:1595
 #, 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:1662
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: ../src/dialogs.py:1707
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:1709
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "Консоль XML"
 
-#: ../src/dialogs.py:1830
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Список доступа <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1834
+#: ../src/dialogs.py:1839
+#, python-format
 msgid "Privacy List for %s"
 msgstr "Список доступа для %s"
 
-#: ../src/dialogs.py:1882
+#: ../src/dialogs.py:1887
+#, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr "Номер: %s, действие: %s, тип: %s, значение: %s"
 
-#: ../src/dialogs.py:1885
+#: ../src/dialogs.py:1890
+#, python-format
 msgid "Order: %s, action: %s"
 msgstr "Номер: %s, действие: %s"
 
-#: ../src/dialogs.py:1927
+#: ../src/dialogs.py:1932
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Изменить правило</b>"
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2019
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавить правило</b>"
 
-#: ../src/dialogs.py:2110
+#: ../src/dialogs.py:2115
+#, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки доступа для %s"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2117
 msgid "Privacy Lists"
 msgstr "Списки доступа"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2185
 msgid "Invalid List Name"
 msgstr "Недопустимое имя списка"
 
-#: ../src/dialogs.py:2181
+#: ../src/dialogs.py:2186
 msgid "You must enter a name to create a privacy list."
 msgstr "Необходимо ввести имя для новой учетной записи."
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2215
+#: ../src/dialogs.py:2220
+#, python-format
 msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s приглашает вас в комнату %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Выберите звуковой файл"
 
-#: ../src/dialogs.py:2293 ../src/dialogs.py:2338
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/dialogs.py:2298
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "В формате Wav"
 
-#: ../src/dialogs.py:2328
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Выбрать картинку"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/dialogs.py:2400
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когда %s происходит:"
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавление специального уведомления для %s"
 
 #. # means number
-#: ../src/dialogs.py:2473
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:2479
+#: ../src/dialogs.py:2484
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr "когда я "
 
@@ -3516,6 +3449,7 @@ msgid "Without a connection, you can not browse available services"
 msgstr "Для просмотра сервисов необходимо сначала подсоединиться к серверу"
 
 #: ../src/disco.py:497
+#, python-format
 msgid "Service Discovery using account %s"
 msgstr "Обзор сервисов с учётной записи %s"
 
@@ -3653,10 +3587,12 @@ msgid "Connection with peer cannot be established."
 msgstr "Соединение не может быть установлено."
 
 #: ../src/filetransfers_window.py:224
+#, python-format
 msgid "Recipient: %s"
 msgstr "Получатель: %s"
 
 #: ../src/filetransfers_window.py:226
+#, python-format
 msgid "Error message: %s"
 msgstr "Сообщение об ошибке: %s"
 
@@ -3697,6 +3633,7 @@ msgid "%s wants to send you a file:"
 msgstr "%s хочет отправить вам файл:"
 
 #: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
+#, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не могу заместить существующий файл \"%s\""
 
@@ -3704,8 +3641,7 @@ msgstr "Не могу заместить существующий файл \"%s\
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
-msgstr ""
-"Этот файл уже существует, и у вас нет права его перезаписать."
+msgstr "Этот файл уже существует, и у вас нет права его перезаписать."
 
 #: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
@@ -3768,6 +3704,211 @@ msgstr "Отправитель:"
 msgid "Pause"
 msgstr "Пауза"
 
+#: ../src/gajim.py:47
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim для запуска требуется X-сервер. Выход..."
+
+#: ../src/gajim.py:51
+msgid "Gajim needs PyGTK 2.6 or above"
+msgstr "Gajim требуется PyGTK 2.6 или выше"
+
+#: ../src/gajim.py:52
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr "Gajim для запуска требуется PyGTK 2.6 или выше. Выход..."
+
+#: ../src/gajim.py:54
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim требуется GTK 2.6 или выше"
+
+#: ../src/gajim.py:55
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr "Gajim для запуска требуется GTK 2.6 или выше. Выход..."
+
+#: ../src/gajim.py:60
+msgid "GTK+ runtime is missing libglade support"
+msgstr "У GTK отсутствует поддержка libglade."
+
+#: ../src/gajim.py:62
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Пожалуйста, удалите вашу текущую версию GTK и установите последнюю "
+"стабильную версию с %s"
+
+#: ../src/gajim.py:64
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr "Пожалуйста, удостоверьтесь что GTK+ и PyGTK поддерживают libglade."
+
+#: ../src/gajim.py:69
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim для запуска требуется PySQLite2"
+
+#: ../src/gajim.py:76
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim для запуска требуется pywin32"
+
+#: ../src/gajim.py:77
+#, 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:189
+msgid "Gajim is already running"
+msgstr "Gajim уже запущен"
+
+#: ../src/gajim.py:190
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"По-видимому, уже запущен другой экземпляр Gajim\n"
+"Запустить ещё один?"
+
+#: ../src/gajim.py:297
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Авторизация для %s (id: %s)"
+
+#: ../src/gajim.py:298
+msgid "Do you accept this request?"
+msgstr "Вы принимаете этот запрос?"
+
+#: ../src/gajim.py:344 ../src/notify.py:430
+msgid "Connection Failed"
+msgstr "Соединение разорвалось"
+
+#: ../src/gajim.py:656
+#, python-format
+msgid "Subject: %s"
+msgstr "Тема: %s"
+
+#: ../src/gajim.py:701
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "ошибка при отправке %s ( %s )"
+
+#: ../src/gajim.py:741
+msgid "Authorization accepted"
+msgstr "Авторизация принята"
+
+#: ../src/gajim.py:742
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Контакт \"%s\" авторизовал вас, теперь вы можете видеть его статус."
+
+#: ../src/gajim.py:750
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Контакт \"%s\" отозвал подписку с вами"
+
+#: ../src/gajim.py:751
+msgid "You will always see him or her as offline."
+msgstr "Вы всегда будете видеть его или её в оффлайне."
+
+#: ../src/gajim.py:794
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Связь с \"%s\" не может быть установлена"
+
+#: ../src/gajim.py:795 ../src/common/connection.py:395
+msgid "Check your connection or try again later."
+msgstr "Проверьте настройки сети или попробуйте еще раз позже."
+
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s %s (%s)"
+
+#: ../src/gajim.py:1040
+msgid "Your passphrase is incorrect"
+msgstr "Ваша парольная фраза неверна"
+
+#: ../src/gajim.py:1041
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Вы сейчас соединены без OpenPGP ключа."
+
+#: ../src/gajim.py:1143
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Новое письмо на %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1145
+#, 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:1154
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"От: %(from_address)s"
+
+#: ../src/gajim.py:1297
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s хочет отправить вам файл."
+
+#: ../src/gajim.py:1362
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Успешно получен файл %(filename)s от %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1366
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Передача файла %(filename)s от %(name)s приостановлена."
+
+#: ../src/gajim.py:1379
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "%(name)s успешно получил отправленный вами файл %(filename)s."
+
+#. ft stopped
+#: ../src/gajim.py:1383
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Передача файла %(filename)s к %(name)s приостановлена."
+
+#: ../src/gajim.py:1489
+msgid "Username Conflict"
+msgstr "Такое имя уже есть"
+
+#: ../src/gajim.py:1490
+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:1828
+msgid "Could not save your settings and preferences"
+msgstr "Не могу сохранить ваши установки и настройки"
+
+#: ../src/gajim.py:2020
+msgid "Network Manager support not available"
+msgstr "Network Manager не используется"
+
+#: ../src/gajim.py:2095
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Отсутствует поддержка управления сессиями (отсутствует модуль gnome.ui)"
+
 #: ../src/gajim-remote.py:66
 msgid "Shows a help on specific command"
 msgstr "Показывает помощь для конкретной команды"
@@ -4028,8 +4169,7 @@ msgstr "Отправляемый XML"
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
-msgstr ""
-"Учётная запись, из которой будет отправлен XML."
+msgstr "Учётная запись, из которой будет отправлен XML."
 
 #: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
@@ -4084,208 +4224,6 @@ msgstr ""
 "Аргумент \"%s\" не задан. \n"
 "Наберите \"%s\" help \"%s\" для справки"
 
-#: ../src/gajim.py:47
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim для запуска требуется X-сервер. Выход..."
-
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim требуется PyGTK 2.6 или выше"
-
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim для запуска требуется PyGTK 2.6 или выше. Выход..."
-
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim требуется GTK 2.6 или выше"
-
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim для запуска требуется GTK 2.6 или выше. Выход..."
-
-#: ../src/gajim.py:60
-msgid "GTK+ runtime is missing libglade support"
-msgstr "У GTK отсутствует поддержка libglade."
-
-#: ../src/gajim.py:62
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Пожалуйста, удалите вашу текущую версию GTK и установите последнюю "
-"стабильную версию с %s"
-
-#: ../src/gajim.py:64
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Пожалуйста, удостоверьтесь что GTK+ и PyGTK поддерживают libglade."
-
-#: ../src/gajim.py:69
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim для запуска требуется PySQLite2"
-
-#: ../src/gajim.py:76
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim для запуска требуется pywin32"
-
-#: ../src/gajim.py:77
-#, 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:152
-msgid "Gajim is already running"
-msgstr "Gajim уже запущен"
-
-#: ../src/gajim.py:153
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"По-видимому, уже запущен другой экземпляр Gajim\n"
-"Запустить ещё один?"
-
-#: ../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:430
-msgid "Connection Failed"
-msgstr "Соединение разорвалось"
-
-#: ../src/gajim.py:618
-msgid "Subject: %s"
-msgstr "Тема: %s"
-
-#: ../src/gajim.py:663
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "ошибка при отправке %s ( %s )"
-
-#: ../src/gajim.py:703
-msgid "Authorization accepted"
-msgstr "Авторизация принята"
-
-#: ../src/gajim.py:704
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Контакт \"%s\" авторизовал вас, теперь вы можете видеть его статус."
-
-#: ../src/gajim.py:712
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Контакт \"%s\" отозвал подписку с вами"
-
-#: ../src/gajim.py:713
-msgid "You will always see him or her as offline."
-msgstr "Вы всегда будете видеть его или её в оффлайне."
-
-#: ../src/gajim.py:756
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Связь с \"%s\" не может быть установлена"
-
-#: ../src/gajim.py:757 ../src/common/connection.py:390
-msgid "Check your connection or try again later."
-msgstr "Проверьте настройки сети или попробуйте еще раз позже."
-
-#: ../src/gajim.py:905 ../src/roster_window.py:1201
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s %s (%s)"
-
-#: ../src/gajim.py:1002
-msgid "Your passphrase is incorrect"
-msgstr "Ваша парольная фраза неверна"
-
-#: ../src/gajim.py:1003
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Вы сейчас соединены без OpenPGP ключа."
-
-#: ../src/gajim.py:1105
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Новое письмо на %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1107
-#, 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:1116
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-"\n"
-"От: %(from_address)s"
-
-#: ../src/gajim.py:1258
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s хочет отправить вам файл."
-
-#: ../src/gajim.py:1323
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Успешно получен файл %(filename)s от %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1327
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Передача файла %(filename)s от %(name)s приостановлена."
-
-#: ../src/gajim.py:1340
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "%(name)s успешно получил отправленный вами файл %(filename)s."
-
-#. ft stopped
-#: ../src/gajim.py:1344
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Передача файла %(filename)s к %(name)s приостановлена."
-
-#: ../src/gajim.py:1450
-msgid "Username Conflict"
-msgstr "Такое имя уже есть"
-
-#: ../src/gajim.py:1451
-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:1789
-msgid "Could not save your settings and preferences"
-msgstr "Не могу сохранить ваши установки и настройки"
-
-#: ../src/gajim.py:1981
-msgid "Network Manager support not available"
-msgstr "Network Manager не используется"
-
-#: ../src/gajim.py:2056
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Отсутствует поддержка управления сессиями (отсутствует модуль gnome.ui)"
-
 #: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Тема"
@@ -4317,6 +4255,7 @@ msgstr "Не удалось отправить личное сообщение"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
+#, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Вы больше не находитесь в комнате \"%s\" или \"%s\" вышел."
 
@@ -4370,6 +4309,7 @@ msgid "%s has left"
 msgstr "%s ушел"
 
 #: ../src/groupchat_control.py:899
+#, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
 
@@ -4413,6 +4353,7 @@ msgid "Commands: %s"
 msgstr "Команды: %s"
 
 #: ../src/groupchat_control.py:1210
+#, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 "nickname of an occupant may be substituted, but not if it contains \"@\". If "
@@ -4451,6 +4392,7 @@ msgid "Usage: /%s, hide the chat buttons."
 msgstr "Использование: /%s, скрывает кнопки беседы."
 
 #: ../src/groupchat_control.py:1229
+#, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
@@ -4468,6 +4410,7 @@ msgstr ""
 "комната@сервер, с возможным указанием ника."
 
 #: ../src/groupchat_control.py:1237
+#, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
 "from the group chat and optionally displays a reason. Does NOT support "
@@ -4477,6 +4420,7 @@ msgstr ""
 "комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
 
 #: ../src/groupchat_control.py:1242
+#, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
 "person. (e.g. /%s explodes.)"
@@ -4494,15 +4438,17 @@ msgstr ""
 "отсылает сообщение посетителю с указанным ником."
 
 #: ../src/groupchat_control.py:1251
+#, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
 
 #: ../src/groupchat_control.py:1255
+#, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
-msgstr ""
-"Использование: /%s, показывает список присутствующих в комнате."
+msgstr "Использование: /%s, показывает список присутствующих в комнате."
 
 #: ../src/groupchat_control.py:1259
+#, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
@@ -4521,6 +4467,7 @@ msgid "No help info for /%s"
 msgstr "Нет подсказки для /%s"
 
 #: ../src/groupchat_control.py:1314
+#, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы точно хотите выйти из комнаты \"%s\"?"
 
@@ -4529,7 +4476,7 @@ msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3955
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Не _переспрашивать"
 
@@ -4554,6 +4501,7 @@ msgid "Bookmark already set"
 msgstr "Закладка уже установлена"
 
 #: ../src/groupchat_control.py:1391
+#, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Комната \"%s\" уже есть в ваших закладках."
 
@@ -4629,8 +4577,9 @@ msgstr "Расширение не поддерживается"
 #: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Изображение нельзя сохранить в формате %(type)s. "
-"Сохранить как %(new_filename)s?"
+msgstr ""
+"Изображение нельзя сохранить в формате %(type)s. Сохранить как %"
+"(new_filename)s?"
 
 #: ../src/gtkgui_helpers.py:737
 msgid "Save Image as..."
@@ -4662,6 +4611,11 @@ msgstr "Ник"
 msgid "Message"
 msgstr "Сообщение"
 
+#. holds subject
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Тема"
+
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -4745,10 +4699,12 @@ msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
 #: ../src/notify.py:196
+#, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s меняет статус"
 
 #: ../src/notify.py:206
+#, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s подключился"
 
@@ -4763,6 +4719,7 @@ msgid "New Single Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
 #: ../src/notify.py:234
+#, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Новое личное сообщение из комнаты %s"
 
@@ -4834,7 +4791,7 @@ msgstr "Объединенные учетные записи"
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: ../src/roster_window.py:686 ../src/roster_window.py:3126
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости."
 
@@ -4884,21 +4841,21 @@ msgstr "Менеджер истории"
 msgid "_Join New Group Chat"
 msgstr "Войти в новую комнату"
 
-#: ../src/roster_window.py:1380 ../src/roster_window.py:3319
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:1381
+#: ../src/roster_window.py:1385
 msgid "You must read them before removing this transport."
 msgstr "Просмотрите все ожидающие события перед удалением транспорта."
 
-#: ../src/roster_window.py:1384
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" будет удален"
 
-#: ../src/roster_window.py:1385
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4906,124 +4863,128 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: ../src/roster_window.py:1388
+#: ../src/roster_window.py:1392
 msgid "Transports will be removed"
 msgstr "Транспорты будут удалены"
 
-#: ../src/roster_window.py:1393
+#: ../src/roster_window.py:1397
+#, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports:%s"
 msgstr ""
-"У вас больше не будет возможности приема и отправки сообщений "
-"через эти транспорты:%s."
+"У вас больше не будет возможности приема и отправки сообщений через эти "
+"транспорты:%s."
 
 #. it's jid
-#: ../src/roster_window.py:1413
+#: ../src/roster_window.py:1417
 msgid "Rename Contact"
 msgstr "Переименовать контакт"
 
-#: ../src/roster_window.py:1414
+#: ../src/roster_window.py:1418
+#, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введите новый ник для контакта %s"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1425
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1426
+#, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введите новое название для группы %s"
 
-#: ../src/roster_window.py:1476
+#: ../src/roster_window.py:1480
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../src/roster_window.py:1477
+#: ../src/roster_window.py:1481
+#, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Вы точно хотите удалить группу %s из ростера?"
 
-#: ../src/roster_window.py:1478
+#: ../src/roster_window.py:1482
 msgid "Remove also all contacts in this group from your roster"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: ../src/roster_window.py:1502
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Назначить OpenPGP ключ"
 
-#: ../src/roster_window.py:1503
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ, который будет применен к контакту"
 
-#: ../src/roster_window.py:1784 ../src/roster_window.py:1959
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 msgid "_New group chat"
 msgstr "_Новая комната"
 
-#: ../src/roster_window.py:1842
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Вы не против, если я добавлю Вас себе в ростер?"
 
-#: ../src/roster_window.py:2004 ../src/roster_window.py:2051
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: ../src/roster_window.py:2030
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "П_ереименовать"
 
-#: ../src/roster_window.py:2057
+#: ../src/roster_window.py:2061
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: ../src/roster_window.py:2060
+#: ../src/roster_window.py:2064
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
-#: ../src/roster_window.py:2096
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Соединиться"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Отключиться"
 
-#: ../src/roster_window.py:2225 ../src/roster_window.py:2297
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: ../src/roster_window.py:2369
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:2370
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь \"%s\" будет знать о вашем статусе."
 
-#: ../src/roster_window.py:2394
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:2395
+#: ../src/roster_window.py:2401
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если \"%s\" примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:2407
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:2408
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь \"%s\" всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:2611
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" будет удален из вашего ростера"
 
-#: ../src/roster_window.py:2615
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5031,7 +4992,7 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию, то вы будете "
 "видеть его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:2620
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5039,50 +5000,52 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:2623
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу чтобы этот контакт видел мой статус после удаления"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2627
+#: ../src/roster_window.py:2633
 msgid "Contacts will be removed from your roster"
 msgstr "Контакты будут удалены из вашего ростера"
 
-#: ../src/roster_window.py:2631
+#: ../src/roster_window.py:2637
+#, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Вы удаляете эти контакты:%s.\n"
-"Одновременно вы удалите и авторизацию, то есть они всегда будут "
-"видеть вас в оффлайне."
+"Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
+"оффлайне."
 
-#: ../src/roster_window.py:2703
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Требуется парольная фраза"
 
-#: ../src/roster_window.py:2704
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Введите парольную фразу GPG для учетной записи %s"
 
-#: ../src/roster_window.py:2709
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Сохранить парольную фразу (небезопасно)"
 
-#: ../src/roster_window.py:2717
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Неверная парольная фраза"
 
-#: ../src/roster_window.py:2718
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Пожалуйста, введите парольную фразу для GPG еще раз или нажмите Отмена."
+msgstr ""
+"Пожалуйста, введите парольную фразу для GPG еще раз или нажмите Отмена."
 
-#: ../src/roster_window.py:2775 ../src/roster_window.py:2835
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:2776 ../src/roster_window.py:2836
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -5090,21 +5053,21 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать невидимым?"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: ../src/roster_window.py:2794
+#: ../src/roster_window.py:2800
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:2892
-#, python-format
-msgid "♪ \"%(title)s\" by %(artist)s  ♪"
+#: ../src/roster_window.py:2898
+#, fuzzy, python-format
+msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr "♪ %(artist)s \"%(title)s\" ♪"
 
-#: ../src/roster_window.py:3320 ../src/roster_window.py:3327
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -5112,42 +5075,41 @@ msgstr ""
 "Сообщения будут доступны для чтения позже если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:3905
+#: ../src/roster_window.py:3911
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: ../src/roster_window.py:3907
+#: ../src/roster_window.py:3913
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 msgstr ""
-"Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны "
-"при следующем подключении."
+"Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при "
+"следующем подключении."
 
-#: ../src/roster_window.py:3949
+#: ../src/roster_window.py:3955
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
-msgstr ""
-"Вы хотите создать метаконтакт?"
+msgstr "Вы хотите создать метаконтакт?"
 
-#: ../src/roster_window.py:3951
+#: ../src/roster_window.py:3957
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generaly it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:4118
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Сбросить %s в группе %s"
 
-#: ../src/roster_window.py:4125
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Сделать %s и %s метаконтактами"
 
-#: ../src/roster_window.py:4312
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Изменить сообщение о статусе..."
 
@@ -5177,10 +5139,12 @@ msgid "Status: "
 msgstr "Статус: "
 
 #: ../src/tooltips.py:461
+#, python-format
 msgid "Last status: %s"
 msgstr "Последний статус: %s"
 
 #: ../src/tooltips.py:463
+#, python-format
 msgid " since %s"
 msgstr " с %s"
 
@@ -5221,6 +5185,10 @@ msgstr "Остановлено"
 msgid "Completed"
 msgstr "Завершено"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr "Приостановлено"
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
 #: ../src/tooltips.py:605
 msgid "Stalled"
@@ -5448,17 +5416,28 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:158
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5466,7 +5445,7 @@ msgstr ""
 "Всегда спрашивать перед закрытием окна/вкладки комнаты из этом списка. "
 "Комнаты в списке разделяются пробелом."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:161
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5474,7 +5453,7 @@ msgstr ""
 "Никогда не спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
 "Комнаты в списке разделяются пробелом."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5482,34 +5461,34 @@ msgstr ""
 "Указвает имя хоста, которое мы отсылаем при передаче файлов, в случае если "
 "мы за NAT или используется проброс портов."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC утверждает что KiB = 1024 байт, KB = 1000 байт"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:168
 msgid "Notify of events in the system trayicon."
 msgstr ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Показывать вкладку при одной беседе?"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показывать границу вкладки при одной беседе?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Показывать кнопку закрытия на вкладке?"
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:189
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5517,11 +5496,11 @@ msgstr ""
 "Если True, то Gajim будет завершаться при нажатии на кнопку закрытия окна. "
 "Эта опция учитывается только если используется иконка для трея."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Если True, то Gajim будет регистрировать xmpp:// при каждом запуске"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5529,7 +5508,7 @@ msgstr ""
 "Если True, то Gajim иконку на каждой вкладке, которая содержит непрочитанные "
 "сообщения. В зависимости от темы, она может быть анимированной."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:193
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -5537,7 +5516,7 @@ msgstr ""
 "Если True, то Gajim будет отображать сообщение о статусе, если оно не "
 "пустое, для каждого контакта под именем контакта в окне ростера"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:195
 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."
@@ -5545,7 +5524,7 @@ msgstr ""
 "Если True, то Gajim будет запрашивать аватару для каждого контакта, у "
 "которого её не было в последний раз или она уже слишком старая."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5554,7 +5533,7 @@ msgstr ""
 "Если False, то вы больше не будете видеть статусную строку в окне беседы, "
 "когда контакт меняет его или её статус и/или сообщение о статусе."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:197
 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 "
@@ -5563,28 +5542,28 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:199
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:200
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:205
 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 "
@@ -5594,7 +5573,7 @@ msgstr ""
 "(поведение по умолчанию для большинства менеджеров окон) когда присутствуют "
 "не просмотренные события."
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:207
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -5605,7 +5584,7 @@ msgstr ""
 "информации для комнат"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:209
+#: ../src/common/config.py:210
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5623,77 +5602,77 @@ msgstr ""
 "свое окно. Заметьте, что при изменении этого параметра требуется перезапуск "
 "Gajim, чтобы изменения вступили в силу."
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:211
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Если False, вы больше не будете видеть аватары в окне беседы."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:212
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Если True, то нажатие клавиши Escape будет закрывать вкладку/окно."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:213
 msgid "Hides the buttons in group chat window."
 msgstr "Скрывает кнопки окна комнаты."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:214
 msgid "Hides the buttons in two persons chat window."
 msgstr "Скрывает кнопки в окне беседы."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Скрывает баннер в окне комнаты"
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Скрывает баннер в окне беседы"
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:217
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Скрывает список посетителей в окне комнаты."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:218
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:222
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:223
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFULL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Костыль для jabberd2"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5701,101 +5680,101 @@ msgstr ""
 "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
 "параметре file_transfer_proxies для передачи файлов"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:326
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Используется ли для этого контакта OpenPGP"
 
-#: ../src/common/config.py:326 ../src/common/config.py:329
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr "Язык, который используется при проверке правописания"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:337
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:337 ../src/common/config.py:339
-#: ../src/common/config.py:340 ../src/common/config.py:343
-#: ../src/common/config.py:344
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:351
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: ../src/common/config.py:351
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Ем"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Кушаю, так что оставьте сообщение секретарю."
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "В кино"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Работаю"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Работаю"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Говорю по телефону"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Вышел"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:357
 msgid "I'm out enjoying life."
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:361
 msgid "I'm available."
 msgstr "Я здесь."
 
-#: ../src/common/config.py:361
+#: ../src/common/config.py:362
 msgid "I'm free for chat."
 msgstr "Я готов поболтать."
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:364
 msgid "I'm not available."
 msgstr "Меня нет."
 
-#: ../src/common/config.py:364
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr "Не беспокоить."
 
-#: ../src/common/config.py:365 ../src/common/config.py:366
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:375
+#: ../src/common/config.py:376
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -5804,130 +5783,38 @@ msgstr ""
 "содержит слово из списка muc_highlight_words, или когда сообщение содержит "
 "ваш ник."
 
-#: ../src/common/config.py:376
+#: ../src/common/config.py:377
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
 
-#: ../src/common/config.py:384 ../src/common/optparser.py:195
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "зеленый"
 
-#: ../src/common/config.py:388 ../src/common/optparser.py:181
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "овощной"
 
-#: ../src/common/config.py:392
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "телесный"
 
-#: ../src/common/config.py:396
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "морской"
 
-#: ../src/common/connection.py:164
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Связь с учетной записью \"%s\" была потеряна"
-
-#: ../src/common/connection.py:165
-msgid "Reconnect manually."
-msgstr ""
-
-#: ../src/common/connection.py:176 ../src/common/connection.py:203
-#, python-format
-msgid "Transport %s answered wrongly to register request."
-msgstr "Транспорт %s неверно ответил на запрос о регистрации."
-
-#. wrong answer
-#: ../src/common/connection.py:202
-msgid "Invalid answer"
-msgstr "Неверный ответ"
-
-#: ../src/common/connection.py:389 ../src/common/connection.py:424
-#: ../src/common/connection.py:866
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Не могу соединиться с \"%s\""
-
-#: ../src/common/connection.py:403
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Подключен к серверу %s: %s с %s"
-
-#: ../src/common/connection.py:425
-msgid "Check your connection or try again later"
-msgstr "Проверьте настройки сети или попробуйте еще раз позже"
-
-#: ../src/common/connection.py:450
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Ошибка аутентификации с \"%s\""
-
-#: ../src/common/connection.py:451
-msgid "Please check your login and password for correctness."
-msgstr "Пожалуйста, проверьте правильность логина и пароля."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:568
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "Не задана парольная фраза OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/connection.py:570
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Вы будете подключены к %s без использования OpenPGP."
-
-#. do not show I'm invisible!
-#: ../src/common/connection.py:610
-msgid "invisible"
-msgstr "невидимка"
-
-#: ../src/common/connection.py:611
-msgid "offline"
-msgstr "отключен"
-
-#: ../src/common/connection.py:612
-#, python-format
-msgid "I'm %s"
-msgstr "%s"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:703
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Это сообщение *зашифровано*, см. :JEP:`27`]"
-
-#: ../src/common/connection.py:753
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Тема: %s\n"
-"%s"
-
-#: ../src/common/connection.py:892
-msgid "Not fetched because of invisible status"
-msgstr ""
-
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:43
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 msgid "Unable to load idle module"
 msgstr ""
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:143
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid "Wrong host"
 msgstr "Неверный хост"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:143
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5997,6 +5884,7 @@ msgid "we are now subscribed to %s"
 msgstr ""
 
 #: ../src/common/connection_handlers.py:1674
+#, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s хочет отменить подписку"
 
@@ -6012,6 +5900,98 @@ msgid ""
 "management tools such as http://jru.jabberstudio.org/ to remove it"
 msgstr ""
 
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Связь с учетной записью \"%s\" была потеряна"
+
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
+msgstr ""
+
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr "Транспорт %s неверно ответил на запрос о регистрации."
+
+#. wrong answer
+#: ../src/common/connection.py:202
+msgid "Invalid answer"
+msgstr "Неверный ответ"
+
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
+#: ../src/common/zeroconf/connection_zeroconf.py:217
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Не могу соединиться с \"%s\""
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid "Connected to server %s:%s with %s"
+msgstr "Подключен к серверу %s: %s с %s"
+
+#: ../src/common/connection.py:430
+msgid "Check your connection or try again later"
+msgstr "Проверьте настройки сети или попробуйте еще раз позже"
+
+#: ../src/common/connection.py:455
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Ошибка аутентификации с \"%s\""
+
+#: ../src/common/connection.py:456
+msgid "Please check your login and password for correctness."
+msgstr "Пожалуйста, проверьте правильность логина и пароля."
+
+#. We didn't set a passphrase
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
+msgid "OpenPGP passphrase was not given"
+msgstr "Не задана парольная фраза OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Вы будете подключены к %s без использования OpenPGP."
+
+#. do not show I'm invisible!
+#: ../src/common/connection.py:615
+msgid "invisible"
+msgstr "невидимка"
+
+#: ../src/common/connection.py:616
+msgid "offline"
+msgstr "отключен"
+
+#: ../src/common/connection.py:617
+#, python-format
+msgid "I'm %s"
+msgstr "%s"
+
+#. we're not english
+#. one  in locale and one en
+#: ../src/common/connection.py:708
+msgid "[This message is *encrypted* (See :JEP:`27`]"
+msgstr "[Это сообщение *зашифровано*, см. :JEP:`27`]"
+
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
+#, python-format
+msgid ""
+"Subject: %s\n"
+"%s"
+msgstr ""
+"Тема: %s\n"
+"%s"
+
+#: ../src/common/connection.py:897
+msgid "Not fetched because of invisible status"
+msgstr ""
+
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
@@ -6196,256 +6176,267 @@ msgstr "Конец недели"
 msgid "Weekend!"
 msgstr "Выходные!"
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Неверный символ в имени пользователя."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Требуется адрес сервера."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Неверный символ в имени сервера"
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Неверный символ в ресурсе"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Занят"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Занят"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Недоступен"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Готов поболтать"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Готов поболтать"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Доступен"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Доступен"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Соединяюсь"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "_Ушел"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Отключен"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Отключен"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Невидимка"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "Ошибка"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "К"
 
 #: ../src/common/helpers.py:259
+msgid "From"
+msgstr "От"
+
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Оба"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "Отсутствует"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Модераторы"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Участники"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Посетитель"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Отсутствует"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 msgid "Owner"
 msgstr "Владелец"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 msgid "Member"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "читает сообщение"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "занят чем-то еще"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 msgid "is composing a message..."
 msgstr "печатает сообщение..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "перестал печатать сообщение"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "закрыл окно чата или вкладку"
 
-#: ../src/common/helpers.py:878
+#: ../src/common/helpers.py:880
+#, python-format
 msgid " %d unread message"
 msgid_plural " %d unread messages"
 msgstr[0] " %d непрочитанное сообщение"
 msgstr[1] " %d непрочитанных сообщения"
 msgstr[2] " %d непрочитанных сообщений"
 
-#: ../src/common/helpers.py:884
+#: ../src/common/helpers.py:886
+#, python-format
 msgid " %d unread single message"
 msgid_plural " %d unread single messages"
 msgstr[0] " %d непрочитанное одиночное сообщение"
 msgstr[1] " %d непрочитанных одиночных сообщения"
 msgstr[2] " %d непрочитанных одиночных сообщений"
 
-#: ../src/common/helpers.py:890
+#: ../src/common/helpers.py:892
+#, python-format
 msgid " %d unread group chat message"
 msgid_plural " %d unread group chat messages"
 msgstr[0] " %d непрочитанное сообщение в комнате"
 msgstr[1] " %d непрочитанных сообщения в комнате"
 msgstr[2] " %d непрочитанных сообщений в комнате"
 
-#: ../src/common/helpers.py:896
+#: ../src/common/helpers.py:898
+#, python-format
 msgid " %d unread private message"
 msgid_plural " %d unread private messages"
 msgstr[0] " %d непрочитанное личное сообщение"
 msgstr[1] " %d непрочитанных личных сообщения"
 msgstr[2] " %d непрочитанных личных сообщения"
 
-#: ../src/common/helpers.py:906 ../src/common/helpers.py:908
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
+#, 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:181
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:190 ../src/common/optparser.py:191
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "синий"
 
-#: ../src/common/optparser.py:300
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "создается БД истории"
 
 #: ../src/common/passwords.py:86
+#, python-format
 msgid "Gajim account %s"
 msgstr "Учётная запись Gajim %s"
 
@@ -6461,8 +6452,7 @@ msgstr "Не удалось соединиться с хостом"
 #: ../src/common/zeroconf/client_zeroconf.py:334
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Не удалось соединиться с хостом: истекло время ожидания."
+msgstr "Не удалось соединиться с хостом: истекло время ожидания."
 
 #: ../src/common/zeroconf/client_zeroconf.py:629
 msgid "Contact is offline. Your message could not be sent."
@@ -6504,6 +6494,7 @@ msgid "Please check if avahi-daemon is running."
 msgstr ""
 
 #: ../src/common/zeroconf/connection_zeroconf.py:324
+#, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не могу изменить статус учётной записи \"%s\""
 
@@ -6519,5 +6510,49 @@ msgid "[This message is encrypted]"
 msgstr "[Это сообщение зашифровано]"
 
 #: ../src/common/zeroconf/zeroconf.py:180
+#, python-format
 msgid "Error while adding service. %s"
 msgstr "Ошибка при добавлении службы. %s"
+
+#~ msgid "<b>An error has occured:</b>"
+#~ msgstr "<b>Произошла ошибка:</b>"
+
+#~ msgid "<b>Choose command to execute:</b>"
+#~ msgstr "<b>Выберите команду:</a>"
+
+#~ msgid "Ad-hoc Commands - Gajim"
+#~ msgstr "Специальные команды - Gajim"
+
+#~ msgid "Error description..."
+#~ msgstr "Описание ошибки..."
+
+#~ msgid "Please wait while retrieving command list..."
+#~ msgstr "Получаю список команд. Подождите..."
+
+#~ msgid "Please wait while the command is sending..."
+#~ msgstr "Происходит отправка команды. Подождите..."
+
+#~ msgid "Please wait..."
+#~ msgstr "Подождите..."
+
+#, fuzzy
+#~ msgid "Entry:"
+#~ msgstr "Страна:"
+
+#, fuzzy
+#~ msgid "Feed name:"
+#~ msgstr "имя тeмы"
+
+#, fuzzy
+#~ msgid "Last modified:"
+#~ msgstr "Имя:"
+
+#, fuzzy
+#~ msgid "New entry received"
+#~ msgstr "Когда получено новое сообытие"
+
+#~ msgid "This is result of query."
+#~ msgstr "Вот результат запроса."
+
+#~ msgid "Edit items on the list"
+#~ msgstr "Редактировать элементы списка"
diff --git a/po/sk.po b/po/sk.po
index 93a97fea7..d69b9dc47 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\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"
@@ -46,22 +46,26 @@ msgid "_Discover Services..."
 msgstr "_Preskúmať služby..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "Skupinový rozhovor"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Upraviť účet..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Otvoriť nový e-mail"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stav"
@@ -247,16 +251,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Všeobecné"
 
@@ -315,17 +321,17 @@ msgid "Manage..."
 msgstr "Upraviť..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Nič"
 
@@ -615,11 +621,11 @@ msgstr "Rozšírený editor na editovanie konfigurácie"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Stav:"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Preč"
 
@@ -637,7 +643,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Neviditeľný"
 
@@ -647,21 +653,25 @@ msgid "Launch a command"
 msgstr "príkaz"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Neprítomný"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Mám čas na debatu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "Prehrať _zvuky"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -674,16 +684,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -742,7 +749,7 @@ msgid "for "
 msgstr "Port: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -776,7 +783,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Pridať do zoznamu"
 
@@ -799,7 +806,7 @@ msgstr "_Otvoriť vo web prehliadači"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Začať rozhovor"
 
@@ -808,7 +815,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Poslať _súbor"
@@ -825,12 +832,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_História"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "V skupine"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Konfigurácia miestnosti"
 
@@ -915,11 +927,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr ""
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Účet\n"
 "Skupina\n"
@@ -969,7 +982,7 @@ msgid ""
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Pauza"
 
@@ -1108,14 +1121,14 @@ msgstr "Zakázať"
 msgid "Invitation Received"
 msgstr "Prijaté pozvanie"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Prezývka:"
 
@@ -1133,8 +1146,8 @@ msgstr "Posledné:"
 msgid "Room:"
 msgstr "Miestnosť:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Pripojiť"
 
@@ -1185,7 +1198,7 @@ msgstr "Upraviť Proxy nastavenia"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Meno:"
 
@@ -1201,14 +1214,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Akcie"
 
@@ -1309,10 +1322,12 @@ msgid "Auto _not available after:"
 msgstr "Automaticky _neprítomný(á) po:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Automaticky zistiť pri každom štarte Gajim-u\n"
@@ -1320,19 +1335,15 @@ msgstr ""
 "Vždy použiť aplikácie prostredia KDE ako predvolené\n"
 "Vlastné"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 #, fuzzy
 msgid "B_efore nickname:"
 msgstr "Pred prezývkou:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Rozhovor"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "Zmeniť upozornen_ie na stav:"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1344,43 +1355,63 @@ msgstr ""
 "kohokoľvek, koho nemáte v zozname."
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Správa o stave"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 #, fuzzy
 msgid "Default status _iconset:"
 msgstr "Základná _sada ikoniek:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Zobraziť avatarov kontaktov v zozname"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Zobraziť stavovú správu kontaktov v zozname"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Zmeniť upozornen_ie na stav:"
+
+#: ../data/glade/preferences_window.glade.h:39
 #, fuzzy
 msgid "E_very 5 minutes"
 msgstr "Každých 5 _minút"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Emotikony:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Udalosti"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim môže odoslať a prijať meta-informácie vzťahujúce sa ku konverzácii s "
+"vašim kontaktom. Tu môžete vybrať stavy, o ktorých majú byť odosielané "
+"informácie druhej strane."
+
+#: ../data/glade/preferences_window.glade.h:43
 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 "
@@ -1390,12 +1421,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:41
+#: ../data/glade/preferences_window.glade.h:44
 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:42
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1403,7 +1434,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:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1411,7 +1442,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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1419,25 +1450,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:45
+#: ../data/glade/preferences_window.glade.h:48
 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 #, 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:49
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1446,7 +1477,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať správu o stave kontaktov pod menom v "
 "zozname"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1454,7 +1485,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1464,7 +1495,7 @@ msgstr ""
 "kontakt z MSN bude mať ekvivalentné ikonky pre stavy online, preč, "
 "zaneprázdnený, atď...)"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1472,12 +1503,16 @@ msgstr ""
 "Ak nie je zaškrtnuté, Gajim nahradí ascii emotikony ako ':)' ekvivalentným "
 "grafickým obrázkom"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Upraviť..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1489,86 +1524,97 @@ msgstr ""
 "Podľa účtu\n"
 "Podľa typu"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Upozorni ma na kontakt, ktorý:"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Upozorniť keď príde _Gmail e-mail"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "Pri každej _správe"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "Jedno _okno so správou:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Zmeniť upozornen_ie na stav:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "Prehrať _zvuky"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Čas tlače:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Zobraziť len v _zozname"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "Prihlásiť _sa"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "_Odhlásiť sa"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "T_heme:"
 msgstr "Téma:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Správa pri automatickej zmene stavu na Preč"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Správa pri automatickej zmene stavu na Neprítomný(á)"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "Použiť _transportnú sadu obrázkov"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 #, fuzzy
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Ikonka v paneli (tj. v upozorňovacej oblasti)"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1580,107 +1626,113 @@ msgstr ""
 "Upozornenie na nové správy sa zobrazí len v prípade, ak s kontaktom už "
 "nediskutujete"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Keď je prijatá nová udalosť"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Rozšírený editor na editovanie konfigurácie"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 #, fuzzy
 msgid "_After time:"
 msgstr "Po čase:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "_Before time:"
 msgstr "Pred časom:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Prechádzať:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "_File manager:"
 msgstr "Správca súborov:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "_Font:"
 msgstr "Font:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Zvýrazniť zle napísané slová"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Prichádzajúca správa:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_E-mailový klient:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Upozorni ma na to"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "_Open..."
 msgstr "Otvoriť..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Odchádzajúca správa:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Prehrávač:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Popup"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Návrat Pôvodného nastavenia farieb"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Sort contacts by status"
 msgstr "Zotriediť kontakty podľa stavu"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Status message:"
 msgstr "Správa o stave:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minuty"
 
@@ -1711,7 +1763,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "_Pripojiť Gajim pri štarte"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1729,7 +1781,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "Čierna listina"
@@ -1798,116 +1850,116 @@ msgid "City:"
 msgstr "Mesto:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Spoločnosť:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Krajina:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Oddelenie:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Extra adresa:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Meno:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Domovská stránka:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Prostredné meno:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Viac"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Osobné informácie"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefónne č.:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Pozícia:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "PSČ:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Prefix:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Rola:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Stav:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Ulica:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Titul za:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Práca"
 
@@ -1948,47 +2000,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Upraviť _Skupiny"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Poslať jednoduchú _správu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Začať _rozhovor"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, 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:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Odmietnuť zobraziť stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Odstrániť zo zoznamu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Požiadavky"
 
@@ -2034,8 +2093,8 @@ msgstr "_Obsah dokumentácie"
 msgid "_Discover Services"
 msgstr "_Preskúmať služby"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Upraviť"
 
@@ -2125,36 +2184,42 @@ msgid "_Send & Close"
 msgstr "_Poslať a zatvoriť"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Autorizovať"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Požiadavka o zapísanie"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Autorizovať"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Zakázať"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Wav zvuky"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Zobraziť _zoznam"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "S_tav"
 
@@ -2167,38 +2232,43 @@ msgstr "Požiadať:"
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Komentár: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../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/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "Operačný systém:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stav:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Zápis:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "História _konverzácie"
@@ -2392,7 +2462,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2422,320 +2492,325 @@ msgstr "Pripojenie nie je dostupné"
 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:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(who)s o %(time)s povedal(a): %(message)s\n"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Šifrovanie zapnuté"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Šifrovanie vypnuté"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Nie je v zozname"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, 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:1527
+#: ../src/chat_control.py:1531
 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:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Vypnuté"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minút"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "text správy o stave"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Prvá prijatá správa"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Ďalšia prijatá správa správa"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Kotakt pripojený"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Kontakt odpojený"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Správa odoslaná"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznenie správy v skupinovej diskusii"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa v skupinovej diskusii"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Prijaté pozvanie"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Ste pripojený(á) na server"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 #, 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:1289
+#: ../src/config.py:1337
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Názov účtu je už používané"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Nesprávny názov účtu"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Názov účtu nemôže byť prázdny."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Názov účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabbe ID musí byť v tvare \"používateľ@menoserveru\""
 
-#: ../src/config.py:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Port musí byť číslo."
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Prihlásiť znovu?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 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:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Taký účet nie je k dispozícii"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený na server"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa získať tajné kľúče"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 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:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Názov účtu je už používané"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Upraviť %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Čierna listina"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Zoznam členov"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Zoznam správcov"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Dôvod"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Prezývka"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Rola"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Zakazujem..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2743,11 +2818,11 @@ msgstr ""
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Pridáva sa člen..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2755,11 +2830,11 @@ msgstr ""
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Pridáva sa vlastník..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2767,11 +2842,11 @@ msgstr ""
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Pridáva sa Administrátor..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2779,7 +2854,7 @@ msgstr ""
 "<b>koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2795,92 +2870,102 @@ 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:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuje sa účet %s"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Zmazať"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Čas tlače:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Skupinový rozhovor"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 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:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "Musíte vložiť heslo pre nový účet."
 
-#: ../src/config.py:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí musia zhodovať."
 
-#: ../src/config.py:2963
+#: ../src/config.py:3040
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2889,23 +2974,23 @@ msgstr ""
 "možnosti, alebo neskôr kliknutím na položku Účty v menu Upraviť, v hlavnom "
 "okne"
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol vytvorený úspešne"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Nastala chyba pri vytváraní účtu"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Názov účtu je už používané"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2913,256 +2998,265 @@ msgstr ""
 "Text pod touto čiarou bol povedaný za dobu čo ste jej nevenovali pozornosť "
 "skupinovému rozhovoru"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Akcie pre \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pre web vyhľadávanie chýba \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "Pred %i dňami"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Meno kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "V skupine"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "ID kľúča"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Kontaktné meno"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Správa o stave"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Správa o stave"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Uložiť ako prednastavenú správu o stave"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Zadajte prosím názov pre túto stavovú správu"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adresa:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adresa:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Extra adresa:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Nespravné ID používateľa"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "ID používateľa nesmie obsahovať zdroj."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Kontakt je už v zozname"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "Používateľské ID:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klient"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Bývalí vývojári:"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Bývalí vývojári:"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "POĎAKOVANIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr ""
 "Juraj Michálek (juraj.michalek AT asinus.org)\n"
 "Peter Trško (dogmat AT dogmat.us)"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Nie je možné vstúpiť do miestnosti"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Požiadavka na prihlásenie pre účet %s od %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Už ste v miestnosti %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pripojiť sa ku skupinovému rozhovoru s účtom %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Názov miestnosti alebo meno servera obsahuje nepovolené znaky"
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Spýtať sa pred zatvorením okna/záložky pre skupinovú diskusiu."
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začať rozhovor s účtom %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3172,259 +3266,269 @@ msgstr ""
 "odoslať správu:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený(á) k \"%s\"."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Kontakt sa prihlasil"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odhlásil"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nová správa"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nová jednoduchá správa"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Nová privátna správa"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Skupinová diskusia - rola: Nič"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Kontakt sa odhlásil"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá správa s účtom %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá správa s účtom %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Jednoduchá správa"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "XML konzola"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Popis: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formát riadku rozhovoru</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formát riadku rozhovoru</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Súkromné rozhovory"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Nesprávne meno používateľa"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Musíte vložiť heslo pre nový účet."
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s vás pozval do miestnosti %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Wav zvuky"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Vyberte obrázok"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "Keď %s sa stane:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Pridať špeciálne na %s"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Spojenie"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Ostatný"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Konferencia"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez pripojenia, nemôžete prehľadávať dostupné služby"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prehľadávanie služieb s použitím účtu %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Prehľadávanie služieb"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Služba nebola nájdená"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3432,51 +3536,69 @@ msgstr ""
 "Žiadna služba Nie je k dispozícii na zadanej adrese alebo neodpovedá. "
 "Skontrolujte adresu a skúste opäť."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Služba nie je prehľadávateľná"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Prehľadávanie %s s použitím účtu %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Prehľadávať"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "Táto služba neobsahuje žiadne položky."
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Prieskum %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Používatelia"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Zapísať"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Zapísať"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Zapísať"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Súbor"
@@ -3502,7 +3624,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Vy"
 
@@ -3512,7 +3634,7 @@ msgid "Sender: %s"
 msgstr "Odosielateľ: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Príjemca:"
 
@@ -3579,31 +3701,31 @@ msgstr "Popis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vám chce poslať súbor:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Tento súbor už existuje"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Čo si prajete vykonať?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3639,12 +3761,11 @@ msgstr "Súbor: "
 msgid "It is not possible to send empty files"
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Meno: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Odosielateľ: "
 
@@ -3652,31 +3773,31 @@ msgstr "Odosielateľ: "
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim potrebuje Xserver pre svoj beh. Ukončujem..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim potrebuje PyGTK 2.6+ alebo novšie"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim potrebuje GTK 2.6+ alebo novšie"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ prostredie nemá podporu libglade"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3685,23 +3806,23 @@ 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
+#: ../src/gajim.py:64
 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
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim potrebuje PySQLite2 pre svoj beh"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim potrebuje PySQLite2 pre svoj beh"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3709,87 +3830,87 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorizácia pre %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Akceptujete túto požiadavku?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Spojenie"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Predmet: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, fuzzy, python-format
 msgid "error while sending %s ( %s )"
 msgstr "chyba pri odosielaní"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" vás odobral zo svojho zoznamu"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "Vždy uvidíte jeho alebo ju ako offline."
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je teraz %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Vaša passfráza je nesprávna"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojený(á) bez vášho OpenPGP kľúča."
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, 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
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3800,56 +3921,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vám chce poslať súbor."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia."
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "Pripojenie nie je dostupné"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Podpora Správy sedenia nie je dostupná (chýba modul gnome.ui)"
 
@@ -3872,7 +3998,8 @@ msgid "Shows or hides the roster window"
 msgstr "Ukázať alebo skryť okno so zoznamom"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Zobraz popup okno s ďalšou neprečítanou správou"
 
 #: ../src/gajim-remote.py:82
@@ -4202,8 +4329,8 @@ msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Nie ste už pripojený(á) do miestnosti \"%s\" alebo \"%s\" odišiel(a)."
 
 #: ../src/groupchat_control.py:141
@@ -4220,111 +4347,112 @@ msgid "Insert Nickname"
 msgstr "Zmeniť _prezývku"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy(a) ako %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s je známy(a) ako %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "V skupine"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je teraz %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Prezývka nenájdená: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Táto miestnosť nemá nastavenú tému"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevyzerá ako správny JID"
 
-#: ../src/groupchat_control.py:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Príkazy: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Použitie: /%s <prezývka|JID> [dôvod], zakáže JID v miestnosti. Prezývka "
 "č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:1212
+#: ../src/groupchat_control.py:1217
 #, 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:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použiteie: /%s, vyčistí textové okno."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4333,21 +4461,21 @@ 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:1221
+#: ../src/groupchat_control.py:1226
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Použiteie: /%s, vyčistí textové okno."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Použitie: /%s <JID> [dôvod], pozve JID do aktuálnej miestosti, prípadne sa "
 "zobrazí aj oddôvodnenie."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4356,26 +4484,26 @@ 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:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 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:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "Použitie: /%s <akcia>, odošle akciu pre aktuálnu miestnosť. Používajte "
 "tretiu osobu. (napr. /%s exlodoval(a).)"
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4384,90 +4512,92 @@ 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:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Použitie: /%s <prezývka>, zmení prezývku v aktuálnej miestnosti."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Použitie: /%s [téma], zobrazí alebo zaktualizuje tému v miestnosti."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Použitie: /%s [téma], zobrazí alebo zaktualizuje tému v miestnosti."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, 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:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žiadne informácie s pomocou pre /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ste si istý(á), že chcete opustiť miestnosť \"%s\"?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Ak zatvoríte okno, budete odpojený(á) z tejto miestnosti."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Znovu sa už _nepýtať"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Zmena predmetu"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Prosím, špecifikujte nový predmet:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Zmena prezývky"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 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:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavená"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, 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:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Záložka bola úspešne pridaná"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Môžete špecifikovať dôvod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Zakázať %s"
@@ -4498,78 +4628,78 @@ msgstr "Podrobnosti"
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Chyba čítania súboru:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 #, fuzzy
 msgid "Extension not supported"
 msgstr "Dbus nie je podporovaný."
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Uložiť súbor ako..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 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:103
+#: ../src/history_manager.py:107
 #, fuzzy
 msgid "Contacts"
 msgstr "_Obsah dokumentácie"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Dátum"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 #, fuzzy
 msgid "Nickname"
 msgstr "Prezývka:"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Správa"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 #, fuzzy
 msgid "Subject"
 msgstr "Predmet:"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 #, 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:184
+#: ../src/history_manager.py:188
 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 "
@@ -4583,16 +4713,16 @@ msgstr ""
 "\n"
 "V prípade, že zvolite Áno, prosíme o strpenie..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Export záznamov histórie..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, 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:510
+#: ../src/history_manager.py:514
 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] ""
@@ -4602,11 +4732,11 @@ msgstr[1] ""
 "kontaktmi?"
 msgstr[2] ""
 
-#: ../src/history_manager.py:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Toto je nevratná operácia."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 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?"
@@ -4638,11 +4768,11 @@ msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Správy"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4682,132 +4812,133 @@ msgstr "%(who)s o %(time)s povedal(a): %(message)s\n"
 msgid "New Message from %(nickname)s"
 msgstr "Nová správa ako %s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Nie je možné načítať obrázok"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Prijaté pozvanie"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 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
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Spojiť účty"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Pozorovatelia"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemôžete sa pripojiť do miestnosti, pokiaľ ste neviditeľný(á)"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "použiť %s účet"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "pre %s účet"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "použiť %s účet"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "pre účet %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Spravovať záložky..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "pre účet %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 #, fuzzy
 msgid "History Manager"
 msgstr "Gajim - správca histórie"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, 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
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:1262
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4815,12 +4946,12 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy k tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4829,72 +4960,122 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy k tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "_Obsah dokumentácie"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Vložiť passfrázu ku GPG kľúču pre účet %s."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "_Premenovať"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Vložiť passfrázu ku GPG kľúču pre účet %s."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "_Odstrániť"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Odstráni kontakt zo zoznamu"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Priradiť OpenPGP kľúč"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Nová miestnosť"
+msgid "_New group chat"
+msgstr "Skupinový rozhovor"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "Chce si vás pridať do svojho zoznamu"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Poslať novú správu"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Preme_novať"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "_Onlien používatelia"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "_Prihlásiť"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "_Odhlásiť"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz  bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odstránená"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, 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:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -4903,7 +5084,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:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4911,17 +5092,17 @@ 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:2334
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "Chcem upozorniť kontakt, na to, že bol odstránený"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4930,32 +5111,32 @@ 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
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, 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:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Uložiť passfrázu"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Nesprávna passfráza"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 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:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 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:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4964,131 +5145,155 @@ msgstr ""
 "skupinových diskusií. Ste si skutočne istý(á), že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 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:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Musíte si vytvoriť účet predtým, než budete môcť komunikovať s ostatnými."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Vložiť %s do skupiny %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Zmeniť %s ako podkontakt pre %s"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Zmeniť Správu o stave..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Zmeniť správu o stave..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Rola:"
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Ukryť toto menu"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Pripojenie:"
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Zdroj:"
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Stav:"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Posledná informácia o %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "od %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Zápis:"
+
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Prenesené:"
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Nezačal"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Zastavený"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Dokončený"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Uviaznutý"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Prenášanie"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Táto služba neodpovedala podrobnejšími informáciami"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5096,25 +5301,25 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Pripojenie:"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5122,7 +5327,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:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5130,14 +5335,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:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5145,121 +5350,121 @@ 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:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr "priorita zdroja"
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "vytváranie záznamov databáz"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s je súbor, ale mal by to byť adresár"
 
-#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim bude ukončený"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s je adresár, ale mal by byť súbor"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "vytvorenie %s adresára"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, 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:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Preč ako výsledok nečinnosti"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Neprítomný(á) ako výsledok nečinnosti"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Použiť * / _ pár znakov ako možné formátovacie znaky."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Pridať * a [n] do titulku zoznamu?"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5267,11 +5472,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:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5279,11 +5484,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:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koľko riadkov posunúť pri stlačení Ctrl+šípka hore."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5292,69 +5497,94 @@ msgstr ""
 "Ani url s %s kde je %s slovo/fráza alebo 'WIKTIONARY' čo znamená použitie "
 "wiktionary."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:153
 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:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 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:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 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:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 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:160
+#: ../src/common/config.py:164
 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:162
+#: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC štandard znamná KiB = 1024 bajtov, KB = 1000 bajtov."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Ukázať záložku len ak prebieha konverzácia?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Zobraziť okraj ak niekto konverzuje?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Zobraziť zatváracie tlačidlo v záložke?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Bodkočiarkou oddelený zoznam slov bude zvýraznený rozhovore s viacerými "
 "používateľmi."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5362,11 +5592,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:187
+#: ../src/common/config.py:191
 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:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5374,7 +5604,7 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí ikonku na každej záložke obsahujúcej neprečítané "
 "správy. Závisí na téme, ikonka môže byť animovaná."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5383,7 +5613,7 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí stavovú správu, ak nie je prázdna, pre každý "
 "kontakt v zozname."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5391,7 +5621,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:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5400,29 +5630,37 @@ msgstr ""
 "Ak nie je pravda, nebudete vidieť riadok o zmene stavu kontaktu a jeho/jej "
 "stavovú správu"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5432,18 +5670,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:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5463,217 +5702,229 @@ msgstr ""
 "zobrazené v samostatnom okne. Poznámka: pre aplikovanie zmeny tohoto "
 "nastavenia, je nutné reštartovať Gajim"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 #, 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:206
+#: ../src/common/config.py:212
 #, 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:207
+#: ../src/common/config.py:213
 #, fuzzy
 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:208
+#: ../src/common/config.py:214
 #, 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:209
+#: ../src/common/config.py:215
 #, 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:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat 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."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Jedlo"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Práve jem, prosím nechajte mi odkaz."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Pracujem"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefónujem"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Mám hovor."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Vonku"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Šiel som von užívať si život."
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Prítomný"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Mám čas na debatu"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Služba nie je dostupná"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 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: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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "zelená"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "obchod s potravinami"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "človek"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "námornícka"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Nesprávna passfráza"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5684,49 +5935,54 @@ msgstr ""
 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
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Nie je možné vstúpiť do miestnosti"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "Pre vstup do miestnosti je požadované heslo."
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Vstup do miestnosti vám bol zakázaný."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Takáto miestnosť neexistuje."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "Vytváranie miestností je obmedzené."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Musíte použiť vašu zaregistrovanú prezývku."
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Nie ste v zozname."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5734,27 +5990,27 @@ 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
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sme prihlásení k %s"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "požiadavka na odhlásenie od %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sme odhlásení od %s"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5764,89 +6020,87 @@ msgstr ""
 "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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:163
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-msgid "To continue sending and receiving messages, you will need to reconnect."
+#: ../src/common/connection.py:165
+msgid "Reconnect manually."
 msgstr ""
-"Pre pokračovanie odosielania a prijímania správ, sa musíte znovu pripojiť."
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Transport %s odpovedal nekorektne na registračnú požiadavky."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Nesprávna odpoveď"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Pripojený na server %s:%s s %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Skontrolujte svoje pripojenie alebo skúste neskôr"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikácia bola neúspešná s \"%s\""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passfráza nebola zadaná"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "neviditeľný"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "Som %s"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Táto správa je šifrovaná]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5855,16 +6109,16 @@ msgstr ""
 "Predmet: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 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/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus vlastnosti programu Gajim nemôžu byť použité"
 
@@ -6051,214 +6305,214 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Nepovolený znak v mene účtu."
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Adresa serveru je požadovaná:"
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Nesprávny znak v mene servera."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Nepovolený znak v zdroji."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Mám čas na debatu"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Mám čas na debatu"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Prítomný"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Prítomný"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "Preč"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Neviditeľný"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "?kontakt má stav:Chyba"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "?Zápis už máme:Nič"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Pre"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Oba"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "?Vyžiadať (zápis): Nič"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "?Skupinová diskusia - rola: Nič"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Skupinová diskusia - rola: Nič"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Vlastník"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrátor"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Člen"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "prestal písať správu"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, fuzzy, python-format
 msgid " %d unread message"
 msgid_plural " %d unread messages"
@@ -6266,7 +6520,7 @@ msgstr[0] "Gajim - %d neprečítaná správa"
 msgstr[1] "Gajim - %d neprečítaných správ"
 msgstr[2] ""
 
-#: ../src/common/helpers.py:877
+#: ../src/common/helpers.py:886
 #, fuzzy, python-format
 msgid " %d unread single message"
 msgid_plural " %d unread single messages"
@@ -6274,7 +6528,7 @@ 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
+#: ../src/common/helpers.py:892
 #, fuzzy, python-format
 msgid " %d unread group chat message"
 msgid_plural " %d unread group chat messages"
@@ -6282,7 +6536,7 @@ msgstr[0] "Gajim - %d neprečítaná správa zo skupinovej diskusie"
 msgstr[1] "Gajim - %d neprečítané správy zo skupinovej diskusie"
 msgstr[2] ""
 
-#: ../src/common/helpers.py:889
+#: ../src/common/helpers.py:898
 #, fuzzy, python-format
 msgid " %d unread private message"
 msgid_plural " %d unread private messages"
@@ -6290,7 +6544,7 @@ 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6301,50 +6555,116 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr ""
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "azúrová"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "vytváranie záznamov databáz"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "pre účet %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Spojenie s druhou stranou nie je možné nadviazať."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+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/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, 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
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Nie je možné vstúpiť do miestnosti"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Táto správa je šifrovaná]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Zapísať"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "chyba pri odosielaní"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Nová miestnosť"
+
+#~ msgid "Role: "
+#~ msgstr "Rola:"
+
+#~ msgid "Affiliation: "
+#~ msgstr "Pripojenie:"
+
+#~ 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 ""
+#~ "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)"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6366,10 +6686,6 @@ msgstr "[Táto správa je šifrovaná]"
 #~ msgid "Not Available "
 #~ msgstr "Neprítomný"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Zmazať"
-
 #~ msgid "Contact _Info"
 #~ msgstr "Kontaktné _info"
 
@@ -6400,9 +6716,6 @@ msgstr "[Táto správa je šifrovaná]"
 #~ 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"
@@ -6514,9 +6827,6 @@ msgstr "[Táto správa je šifrovaná]"
 #~ msgid "_Join New Room..."
 #~ msgstr "_Pripojiť sa do novej miestnosti..."
 
-#~ msgid "_Online Users"
-#~ msgstr "_Onlien používatelia"
-
 #~ msgid "_XML Console..."
 #~ msgstr "_XML konzola"
 
@@ -6685,9 +6995,6 @@ msgstr "[Táto správa je šifrovaná]"
 #~ msgid "Chat with"
 #~ msgstr "Rozprávať sa s"
 
-#~ msgid "Send New Message"
-#~ msgstr "Poslať novú správu"
-
 #~ msgid "as %s"
 #~ msgstr "ako %s"
 
diff --git a/po/sv.po b/po/sv.po
index 7920c5699..6cc0951cc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\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"
@@ -45,22 +45,26 @@ msgid "_Discover Services..."
 msgstr "_Upptäck tjänster"
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "_Gruppchatt"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Redigera Konto..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Öppna e-postförfattning"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
@@ -246,16 +250,18 @@ 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:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "Generellt"
 
@@ -317,17 +323,17 @@ msgid "Manage..."
 msgstr "Hantera..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ingen"
 
@@ -616,11 +622,11 @@ msgstr "Avancerad konfigurationsredigerare"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "Status: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "Borta"
 
@@ -638,7 +644,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "Osynlig"
 
@@ -648,21 +654,25 @@ msgid "Launch a command"
 msgstr "kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "Inte tillgänglig"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Ledig för chatt"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "_Spela ljud"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -675,16 +685,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -744,7 +751,7 @@ msgid "for "
 msgstr "Port: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -778,7 +785,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "_Lägg till registret"
 
@@ -801,7 +808,7 @@ msgstr "_Öppna länk i webbläsare"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Starta chatt"
 
@@ -810,7 +817,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Skicka _Fil"
@@ -827,12 +834,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "_Historik"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "I gruppen"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "Rumkonfiguration"
 
@@ -918,11 +930,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Tabfärger För Chatstatus</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "Konto\n"
 "Grupp\n"
@@ -973,7 +986,7 @@ msgstr ""
 "MUC-dirigerade\n"
 "Meddelanden"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "Pausad"
 
@@ -1111,14 +1124,14 @@ msgstr "Neka"
 msgid "Invitation Received"
 msgstr "Inbjudan mottagen"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 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/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "Smeknamn:"
 
@@ -1136,8 +1149,8 @@ msgstr "Nyligen:"
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Anslut till"
 
@@ -1188,7 +1201,7 @@ msgstr "Hantera proxyprofiler"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "Namn:"
 
@@ -1204,14 +1217,14 @@ 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:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Åtgärder"
 
@@ -1311,10 +1324,12 @@ msgid "Auto _not available after:"
 msgstr "Automatiskt ej tillgä_nglig efter:"
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "Detektera vid varje Gajimstart\n"
@@ -1322,18 +1337,14 @@ msgstr ""
 "Använd alltid KDEs standardprogram\n"
 "Anpassa"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "För_e smeknamn:"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "Chatt"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "Chattstatusmeddelanden:"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1345,39 +1356,59 @@ msgstr ""
 "alla kontakter som inte finns i ditt register"
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "Statusmeddelande"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "Standarduppsättning av _statusikoner:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "Visa a_vatarer för kontakter i registret"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "Visa status_meddelanden för kontakter i registret"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "Chattstatusmeddelanden:"
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "_Var 5:e minut"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "Känsloikoner:"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Händelser"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim kan skicka och ta emot meta-information relaterad till en konversation "
+"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:43
 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 "
@@ -1387,14 +1418,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:41
+#: ../data/glade/preferences_window.glade.h:44
 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:42
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
@@ -1402,7 +1433,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:43
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1410,7 +1441,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:44
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1418,19 +1449,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:45
+#: ../data/glade/preferences_window.glade.h:48
 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:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1438,7 +1469,7 @@ msgstr ""
 "Om ibockad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchatfönstret"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1446,7 +1477,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:50
+#: ../data/glade/preferences_window.glade.h:53
 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"
@@ -1454,7 +1485,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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1464,7 +1495,7 @@ msgstr ""
 "kontakt för MSN kommer ha msn:s ikon för status online, borta, upptagen, "
 "osv...)"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1472,11 +1503,15 @@ msgstr ""
 "Om inte avstängd kommer Gajim ersätta ascii smilies som ':)' med motsvarande "
 "grafiska känsloikoner"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "Ha_ntera..."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1488,86 +1523,97 @@ msgstr ""
 "Per konto\n"
 "Per typ"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "Meddela när kontakter: "
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Meddela om ny _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "Vid varje _meddelande"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "Ett meddelandefönster:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "Chattstatusmeddelanden:"
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "_Spela ljud"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "Skriv ut tid:"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 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:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "Visa enbart i _registret"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "Loggar _in"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "Loggar _ut"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "Det automatiska statusmeddelandet när du är borta"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "Det automatiska statusmeddelandet när du inte är tillgänglig"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr ""
 "Använd _transporternas\n"
 "ikonuppsättningar"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Använd aktivitetsfältet (aka. notifieringsyta)"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1579,96 +1625,102 @@ 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:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "När en ny händelse är mottagen"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Avancerad konfigurationsredigerare"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "Efter tid:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "Före tid:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "_Webbläsare:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "_Filhanterare:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "Teckensnitt:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 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:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "_Inkommande meddelande:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "_Logga statusändringar hos kontakter"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "_E-postklient:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "_Aldrig"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "_Meddela mig"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "Öppna..."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "Utgående meddelande:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "_Spelare:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "_Öppna det"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "Återställ till Standardfärger"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "_Sortera kontakter efter status"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "_Statusmeddelande:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "minuter"
 
@@ -1699,7 +1751,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "Anslut vid start av Gajim"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1717,7 +1769,7 @@ msgstr "Jabber-ID:"
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "Ban-lista"
@@ -1786,116 +1838,116 @@ msgid "City:"
 msgstr "Ort:"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Företag:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "Land:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "Avdelning:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "Extra adress:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "Förnamn:"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "Hemsida:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "Mellannamn:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "Mer"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "Personlig Information"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "Telefonnr.:"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "Position:"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "Postnummer:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "Prefix:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Roll:"
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "Delstat:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "Gatuadress:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "Suffix:"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "Jobb"
 
@@ -1936,47 +1988,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "Redigera _grupper"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Skicka enstaka _meddelande"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Starta _Chatt"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, 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:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, 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:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "Ta bo_rt från register"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "Byt _namn"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "_Prenumeration"
 
@@ -2022,8 +2081,8 @@ msgstr "_Innehåll"
 msgid "_Discover Services"
 msgstr "_Upptäck tjänster"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "R_edigera"
 
@@ -2113,35 +2172,41 @@ msgid "_Send & Close"
 msgstr "_Skicka & stäng"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Auktorisera"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 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
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "Prenumerationsförfrågan"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "_Auktorisera"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "_Neka"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Wav-ljud"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Visa Alla Väntande Händelser"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "Visa _Registret"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
@@ -2154,38 +2219,43 @@ msgstr "Fråga:"
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "Kommentar: %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Kontakter"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Resurs:"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "Prenumeration:"
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Logga konversationshistorik"
@@ -2379,7 +2449,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2408,50 +2478,50 @@ msgstr "En förbindelse är inte tillgänglig"
 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:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "Chatts"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, 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:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "Kryptering aktiverad"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "Kryptering deaktiverad"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "Inte i registret"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du mottog just ett meddelande från \"%s\""
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2459,272 +2529,277 @@ msgstr ""
 "Om du stänger den här fliken och du har historik avslaget kommer meddelandet "
 "att förloras."
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "Avstängd"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Var %s _minut"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, 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
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "Första meddelandet har mottagits"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "Nytt Meddelande Har Mottagits"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "Kontakt Ansluten"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "Kontakt Loggade Ut"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "Meddelande Skickat"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "Markering av Meddelande i Gruppchatt"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "Meddelande Mottaget i Gruppchatt"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Inbjudan mottagen"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP är inte användbart på den här datorn"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 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:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "Olästa händelser"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 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:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 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:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 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:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Strax tillbaka"
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "Logga in igen nu?"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 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:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 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:1540 ../src/dialogs.py:1099 ../src/dialogs.py:1257
-#: ../src/disco.py:414 ../src/profile_window.py:314
-#: ../src/profile_window.py:380
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 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:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, 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
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 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:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "Val av OpenPGP-nyckel"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 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:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har inget aktivt konto"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "Ban-lista"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "Medlemslista"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "Ägarelista"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "Administratörlista"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "Anledning"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "Bannlyser..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2732,11 +2807,11 @@ msgstr ""
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2744,21 +2819,21 @@ msgstr ""
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 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:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "Lägger till Administratör..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2766,7 +2841,7 @@ msgstr ""
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2782,88 +2857,98 @@ 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:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Lösenord Krävs"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv in lösenordet för konto %s"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "Radera"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Skriv ut tid:"
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Gruppchatt"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 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:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 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:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 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:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 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:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "Dubblett av Jabber-ID"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "Detta kontot är redan konfigurerat i Gajim."
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "Kontot har blivit tillagt"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2871,23 +2956,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:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "Ditt nya konto har skapats"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "Ett fel uppstod när kontot skulle skapas"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2895,254 +2980,263 @@ msgstr ""
 "Texten under denna linje är vad som har sagts sedan du senast hade fokus på "
 "denna gruppchatt"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Åtgärder för \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 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:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsökning saknar ett \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 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:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagar sen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens namn: <i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "Grupp"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "Nyckel-ID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "Kontaktnamn"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr "Statusmeddelande för %s"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "Spara som Valbart Statusmeddelande"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "Skriv ett namn för detta statusmeddelande"
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adress:"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adress:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Extra adress:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, 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:457
+#: ../src/dialogs.py:459
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "Användarens ID får inte innehålla en resurs."
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "Kontakten finns redan i registret"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "Den här kontakten finns redan i ditt register."
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "Användar-ID:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabberklient"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "TACK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr ""
 "Christian Bjälevik <nafallo@magicalforest.se>\n"
 "Oscar Hellström <oscar@oscarh.net>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Lyckades inte gå med i rummet"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Prenumerationsförfrågan för konto %s från %s"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "Du är redan i rummet %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 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:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt med konto %s"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "Gömmer bannern i gruppchatfönstret"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3152,258 +3246,268 @@ msgstr ""
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Förbindelse inte tillgänglig"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Lyckades inte skriva fil i %s"
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 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:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "Kontakt Loggade In"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "Nytt Enstaka Meddelande"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Kontakt Loggade Ut"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enstaka Meddelande med konto %s"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enstaka Meddelande med konto %s"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konsol för %s"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr "XML-konsol"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "Beskrivning: %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Format av en rad</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Format av en rad</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Privat Chatt"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "Ogiltigt användarnamn"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "Du måste skriva in ett lösenord för det nya kontot."
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s har bjudit in dig till %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "Välj Bild"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "När %s blir:"
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Lägger Till Speciellt Meddelande För %s"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "Förbindelse"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "Andra"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "Konferens"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 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:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Söker tjänster med konto %s"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "Tjänstefinnare"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3411,51 +3515,69 @@ msgstr ""
 "Adressen du angav är ingen tjänstadress eller så svarar inte tjänsten. "
 "Kontrollera adressen och försök igen."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Tjänst är inte bläddringsbar"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 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:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Bläddrar %s med konto %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 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:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Undersöker %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "Användare"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "Beskrivning"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "Prenumerera"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "_Prenumerera"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "_Prenumerera"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "Fil"
@@ -3481,7 +3603,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "Du"
 
@@ -3491,7 +3613,7 @@ msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Mottagare: "
 
@@ -3558,31 +3680,31 @@ msgstr "Beskrivning: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vill skicka en fil till dig:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "Vad vill du göra?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3618,12 +3740,11 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Sändare: "
 
@@ -3631,31 +3752,31 @@ msgstr "Sändare: "
 msgid "Pause"
 msgstr "Paus"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim behöver Xserver för att fungera. Avbryter..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim behöver PyGTK 2.6 eller senare"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 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
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim behöver GTK 2.6 eller senare"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 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
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime saknar libgladestöd"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3664,22 +3785,22 @@ msgstr ""
 "Vänligen ta bort din nuvarande GTK+ runtime och installera senaste stabila "
 "version från %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 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
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim behöver PySQLite2 för att fungera"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim behöver PySQLite2 för att fungera"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3687,86 +3808,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Auktorisering för %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Förbindelse"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Ämne: %s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "problem vid sändning %s ( %s )"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, 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
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 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
+#: ../src/gajim.py:794
 #, 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
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 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
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s är nu %s (%s)"
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 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
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny Epost på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3776,56 +3897,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, 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
+#: ../src/gajim.py:1366
 #, 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
+#: ../src/gajim.py:1379
 #, 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
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "En förbindelse är inte tillgänglig"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management-stöd inte tillgängligt (saknar gnome.ui-modul)"
 
@@ -3848,7 +3974,8 @@ msgid "Shows or hides the roster window"
 msgstr "Visar eller gömmer registerfönstret"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "Öppnar ett fönster med nästa olästa meddelande"
 
 #: ../src/gajim-remote.py:82
@@ -4179,8 +4306,8 @@ msgstr "Skicka privat meddelande misslyckades"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Du är inte längre i rummet \"%s\" eller \"%s\" har lämnat."
 
 #: ../src/groupchat_control.py:141
@@ -4197,99 +4324,100 @@ msgid "Insert Nickname"
 msgstr "Byt smek_namn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, 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:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "I gruppen"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s är nu %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Smeknamnet kunde inte hittas: %s"
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "Det här rummet har inget ämne"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s verkar inte vara ett giltigt JID"
 
-#: ../src/groupchat_control.py:1181
+#: ../src/groupchat_control.py:1185
 #, 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:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandon: %s"
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "Användning: /%s <smeknamn|JID> [reason], bannlyser JID från rummet. "
 "Smeknamnet kan substitueras, men inte om det innehåller \"@\". Of JID "
 "befinner sig i rummet kommer han/hon/den/det också att att bli sparkad. "
 "Stödjer INTE mellanslag i smeknamn."
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4297,12 +4425,12 @@ msgstr ""
 "Användning: /%s <semknamn>, öppnar ett privat chattfönster till den "
 "specificerade deltagaren."
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Användning: /%s, tömmer fönstret från text."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4311,21 +4439,21 @@ msgstr ""
 "Användning: /%s [anledning], stänger aktuellt fönster eller flik och visar "
 "anledning om sådan specificerades."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Användning: /%s, gömmer knapparna."
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
 "Användning: /%s <JID> [anledning], bjuder in JID till aktivt rum med en "
 "valbar anledning."
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4334,26 +4462,26 @@ msgstr ""
 "Användning: /%s <rum>@<server>[/smeknamn], erbjuder att delta i rum@server "
 "med valbart smeknamn"
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 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:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "Användning: /%s <handling>, skickar handling till aktivt rum. Använd tredje "
 "person. (t.ex. /%s exploderar.)"
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4362,22 +4490,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:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Användning /%s <smeknamn>, byter ditt smeknamn i aktivt rum."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Användning /%s [ämne], visar eller uppdaterar nuvarande ämne."
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Användning /%s [ämne], visar eller uppdaterar nuvarande ämne."
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4385,70 +4513,72 @@ msgstr ""
 "Användning: /%s <meddelande>, skickar meddelande utan att leta efter andra "
 "kommandon."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjälp för /%s"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Är du säker på att du vill lämna rum \"%s\"?"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 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:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Fråga mig i_nte igen"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "Ange det nya smeknamnet du vill använda:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "Bokmärke finns redan"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, 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:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "Bokmärke har blivit ordentligt tillagt"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 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:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
@@ -4479,74 +4609,74 @@ msgstr "Detaljer"
 msgid "Error: cannot open %s for reading"
 msgstr "Fel: kan inte öppna %s för läsning"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "Fel vid läsning av fil:"
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 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:325
+#: ../src/gtkgui_helpers.py:334
 #, 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:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Spara fil som..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "Kan inte hitta historie- och logdatabas"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Smeknamn"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Meddelande"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "Ämne"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 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:184
+#: ../src/history_manager.py:188
 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 "
@@ -4560,26 +4690,26 @@ msgstr ""
 "\n"
 "Om du väljer JA, vänligen vänta..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "Exporterar Loggar..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, 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:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Denna operation kan inte göras ogjord."
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 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?"
@@ -4610,11 +4740,11 @@ msgstr "Status är nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4654,46 +4784,46 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "Kunde inte ladda bild"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "Inbjudan mottagen"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 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
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "publicering av vCard misslyckades"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4701,86 +4831,87 @@ msgstr ""
 "Det uppstod ett fel vid publiceringen av er personliga information, var "
 "vänlig försök igen senare."
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 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
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observerande"
 
-#: ../src/roster_window.py:603 ../src/roster_window.py:2837
-msgid "You cannot join a room while you are invisible"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan inte ansluta till ett rum när du är osynlig"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "använder konto %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "till %s konto"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "använder %s konto"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "för konto %s"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Hantera bokmärken..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "för konto %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "Hantera Historik"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Anslut till gruppchatt"
 
-#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
-#: ../src/roster_window.py:3027
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, 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
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -4788,12 +4919,12 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "från denna transport."
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4802,74 +4933,124 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "från denna transport."
 
-#: ../src/roster_window.py:1314
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "Kontakter"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Skriv in GPG-nyckelns lösenfras för konto %s."
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "Byt _namn"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "Skriv in GPG-nyckelns lösenfras för konto %s."
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "Ta _bort"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Ta bort en kontakt från register"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "Nytt rum"
+msgid "_New group chat"
+msgstr "Gruppchatt"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 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:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Nytt meddelande"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "Döp om"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "_Anslutna användare"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "Ans_lut"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "K_oppla från"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "Byt _Statusmeddelande"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, 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:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -4877,7 +5058,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:2333
+#: ../src/roster_window.py:2626
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4885,19 +5066,19 @@ 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:2334
+#: ../src/roster_window.py:2629
 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"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4906,32 +5087,32 @@ 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
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, 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:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "Spara lösenfras"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "Fel Lösenfras"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 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:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4939,20 +5120,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:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 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:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4960,111 +5141,134 @@ msgstr ""
 "Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
 "historik påslagen."
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Placera %s i grupp %s"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gör %s till en metakontakt för %s"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "Byt Statusmeddelande..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "_Byt Statusmeddelande..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "Roll: "
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "Gömmer denna meny"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "Anknytning: "
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber-ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Senaste status på %s"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "från %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber-ID:"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "Prenumeration: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
+
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "Nerladdning"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "Uppladdning"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "Överfört: "
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Inte startad"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Färdig"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "Avstannad"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "Överför"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "Denna tjänst har ännu inte svarat med detaljerad information"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5072,25 +5276,25 @@ msgstr ""
 "Denna tjänst kunde inte svara med detaljerad information.\n"
 "Tjänsten är antagligen föråldrad eller trasig."
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "från %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "Anknytning: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5098,7 +5302,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5106,132 +5310,132 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 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:271
+#: ../src/vcard.py:291
 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:279
+#: ../src/vcard.py:299
 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:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "skapar logdatabas"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s är en fil, men borde vara en katalog"
 
-#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim kommer nu avslutas"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s är en katalog, men borde vara en fil"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "skapar katalogen %s"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, 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:59
+#: ../src/common/config.py:60
 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:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "Borta på grund av inaktivitet"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 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:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "Inte tillgänglig på grund av inaktivitet"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandla par av * / _ som möliga formateringstecken."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 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:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Lägg till * och [n] i registerfönstrets titel."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5239,12 +5443,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:142
+#: ../src/common/config.py:144
 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:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5252,11 +5456,11 @@ msgstr ""
 "Skicka meddelande med Ctrl+Enter och gör radbryt med Enter (Mirabilis ICQ "
 "Klientens standardbeteende)."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hur många rader skall sparas för Ctrl+KeyUP."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5265,37 +5469,58 @@ 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:151
+#: ../src/common/config.py:153
 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:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fråga innan gruppchattflik eller -fönster stängs."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Fråga alltid innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr ""
 "Fråga aldrig innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -5303,30 +5528,34 @@ msgstr ""
 "Åtsidosätter vilket värdnamn vi skickar vid filöverföring, t.ex. vid NAT och "
 "port forwarding."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 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:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Visa flik när endast en konversation är aktiv?"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Visa flikkant om endast en konversation är aktiv?"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Visa stängknapp i flik?"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolonseparerad lista av ord som blir upplysta i gruppchatt."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5334,11 +5563,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:187
+#: ../src/common/config.py:191
 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:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5346,7 +5575,7 @@ msgstr ""
 "Om True kommer Gajim att visa en ikon på varje flik som innehåller olästa "
 "meddelanden. Beroende på tema kan denna ikon vara animerad."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5355,7 +5584,7 @@ msgstr ""
 "Om True kommer Gajim att visa statusmeddelande, om inte tomt, för varje "
 "kontakt under dess namn i registerfönstret"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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."
@@ -5363,7 +5592,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:192
+#: ../src/common/config.py:196
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -5372,29 +5601,37 @@ 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:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5404,18 +5641,19 @@ msgstr ""
 "blinka (standardbeteende i de flesta fönsterhanterare) när det finns "
 "väntande händelser."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5434,67 +5672,82 @@ 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:205
+#: ../src/common/config.py:211
 #, 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:206
+#: ../src/common/config.py:212
 #, 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:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "Gömmer knapparna i gruppchattfönstret"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "Gömmer knapparna i tvåpersoners chattfönster"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "Gömmer bannern i gruppchatfönstret"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "Gömmer bannern i tvåpersoners chattfönster"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gömmer deltagarelistan i gruppchatfönstret"
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5502,150 +5755,147 @@ 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:317
+#: ../src/common/config.py:326
 #, 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
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "Äter"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "Jag äter, så lämna ett meddelande."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "Arbetar"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Jag är ute och njuter av livet."
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "Tillgänglig"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Ledig för chatt"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "Tjänst är inte tillgänglig"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 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: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)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 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:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "grön"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "grönsaker"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "mänsklig"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "marin"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 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
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "Fel Lösenfras"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5656,49 +5906,54 @@ msgstr ""
 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
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "Lyckades inte gå med i rummet"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 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."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "Du är bannlyst från detta rummet."
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "Det finns inget sådant rum."
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "Möjligheten att skapa rum är begränsad."
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "Ditt registrerade smeknamn måste användas."
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "Du är inte med i medlemslistan."
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5707,27 +5962,27 @@ msgstr ""
 "deltagare.\n"
 "Vänligen ange ett annat smeknamn nedan:"
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi prenumererar nu på %s"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "avprenumerationsförfrågan från %s"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi prenumererar inte längre på %s"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5737,88 +5992,87 @@ msgstr ""
 "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
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: ../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:165
+msgid "Reconnect manually."
+msgstr ""
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Transporten %s svarade felaktigt på en registreringsbegäran."
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../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:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Ansluten till server %s:%s med %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "Kontrollera din förbindelse eller försök igen"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggning misslyckades med \"%s\""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 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:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "Lösenordsfras för OpenPGP angavs inte"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, 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:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "osynlig"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "frånkopplad"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, 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
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Det här meddelandet är krypterat]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5827,16 +6081,16 @@ msgstr ""
 "Ämne: %s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python-bindningar saknas på den här datorn"
 
-#: ../src/common/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-Bus-egenskaper kan inte användas"
 
@@ -6024,242 +6278,242 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Ogiltigt tecken i användarnamn"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Serveradress krävs."
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Ogiltigt tecken i värdnamn."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Ogiltigt tecken i resurs."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "_Upptagen"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "_Inte tillgänglig"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "_Ledig för chatt"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "Ledig för chatt"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "_Tillgänglig"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "Upprättar förbindelse"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "_Borta"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "_Frånkopplad"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "_Osynlig"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "?kontakt har status:Okänd"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "?kontakt har status:Har fel"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "?Prenumeration vi redan har:Ingen"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "Till"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "Från"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Båda"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "?Fråga (för prenumeration):Ingen"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "_Ägare"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administratör"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "_Medlem"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "uppmärksammar konversationen"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "gör något annat"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 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:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "tog en paus i skrivandet"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, 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
+#: ../src/common/helpers.py:886
 #, 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
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6270,50 +6524,115 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "fel: kan inte öppna %s för läsning"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "skapar logdatabas"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "för konto %s"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "Förbindelse med motpart kan inte etableras."
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+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/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, 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
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Lyckades inte gå med i rummet"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[Det här meddelandet är krypterat]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Prenumerera"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "problem vid sändning %s ( %s )"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "Nytt rum"
+
+#~ msgid "Role: "
+#~ msgstr "Roll: "
+
+#~ msgid "Affiliation: "
+#~ msgstr "Anknytning: "
+
+#~ 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 ""
+#~ "Ljud att spela när MUC-meddelande anländer. (Denna inställning behandlas "
+#~ "endast om notify_on_all_muc_messages är satt till True)"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6335,10 +6654,6 @@ msgstr "[Det här meddelandet är krypterat]"
 #~ msgid "Not Available "
 #~ msgstr "Inte tillgänglig"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Radera"
-
 #~ msgid "Contact _Info"
 #~ msgstr "Kontakt_info"
 
@@ -6369,9 +6684,6 @@ msgstr "[Det här meddelandet är krypterat]"
 #~ 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"
@@ -6464,9 +6776,6 @@ msgstr "[Det här meddelandet är krypterat]"
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "Om ibockad kommer Gajim också att ha en aktivitetsfältsikon"
 
-#~ msgid "_Online Users"
-#~ msgstr "_Anslutna användare"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Starta Chatt med konto %s"
@@ -6611,10 +6920,6 @@ msgstr "[Det här meddelandet är krypterat]"
 #~ msgid "Chat with"
 #~ msgstr "Chatta med"
 
-#, fuzzy
-#~ msgid "Send New Message"
-#~ msgstr "Nytt meddelande"
-
 #~ msgid "as %s"
 #~ msgstr "som %s"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 514f4bf12..6318fbbb5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 10:19+0300\n"
+"POT-Creation-Date: 2006-11-26 22:15+0100\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"
@@ -46,22 +46,26 @@ msgid "_Discover Services..."
 msgstr "发掘服务(_D)..."
 
 #: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr ""
+
+#: ../data/glade/account_context_menu.glade.h:5
 #: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:6
 msgid "_Group Chat"
 msgstr "群聊(_G)"
 
-#: ../data/glade/account_context_menu.glade.h:5
+#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "修改帐户(_M)..."
 
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/glade/account_context_menu.glade.h:7
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "打开邮件编辑器(_O)"
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "状态(_S)"
@@ -244,16 +248,18 @@ msgid "Edit Personal Information..."
 msgstr "编辑个人信息..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:455
-#: ../src/notify.py:477 ../src/notify.py:489 ../src/common/helpers.py:895
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:904
 msgid "Gajim"
 msgstr "Gajim"
 
+#. Contact is not in a group, so count it in General group
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:308 ../src/roster_window.py:1297
-#: ../src/roster_window.py:1795
+#: ../src/roster_window.py:342 ../src/roster_window.py:1211
+#: ../src/roster_window.py:1422 ../src/roster_window.py:2032
+#: ../src/roster_window.py:2074 ../src/common/contacts.py:278
 msgid "General"
 msgstr "常规"
 
@@ -308,17 +314,17 @@ msgid "Manage..."
 msgstr "管理..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1583
-#: ../src/config.py:3339
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
+#: ../src/config.py:3429
 msgid "No key selected"
 msgstr "没有选择钥匙"
 
 #. None means no proxy profile selected
-#: ../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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1218
+#: ../src/config.py:1223 ../src/config.py:1407 ../src/config.py:1626
+#: ../src/config.py:1635 ../src/config.py:1694 ../src/config.py:1768
+#: ../src/config.py:2639 ../src/config.py:3419 ../src/config.py:3428
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "(无)"
 
@@ -602,11 +608,11 @@ msgstr "高级设置编辑器"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
-msgid "All Status "
+msgid "All statuses"
 msgstr "状态"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:234
 msgid "Away"
 msgstr "离开"
 
@@ -624,7 +630,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:244
 msgid "Invisible"
 msgstr "隐身"
 
@@ -634,21 +640,25 @@ msgid "Launch a command"
 msgstr "命令"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:217
 msgid "Not Available"
 msgstr "不可用"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "自由聊天"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:17
 #, fuzzy
 msgid "Play a sound"
 msgstr "播放声音(_S)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -661,16 +671,13 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
-msgid "Some special(s) status..."
-msgstr ""
-
 #: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -730,7 +737,7 @@ msgid "for "
 msgstr "端口："
 
 #: ../data/glade/advanced_notifications_window.glade.h:43
-msgid "when I'm "
+msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/change_password_dialog.glade.h:1
@@ -764,7 +771,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:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "_Add to Roster"
 msgstr "添加至名单(_A)"
 
@@ -787,7 +794,7 @@ msgstr "在浏览器中打开连接(_O)"
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:6
+#: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "开始聊天(_S)"
 
@@ -796,7 +803,7 @@ 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:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "发送文件(_F)"
@@ -813,12 +820,17 @@ 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:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
 msgid "_History"
 msgstr "历史(_H)"
 
 #: ../data/glade/data_form_window.glade.h:1
+#, fuzzy
+msgid "Fill in the form."
+msgstr "群组内"
+
+#: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
 msgstr "房间设置："
 
@@ -901,11 +913,12 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>聊天标签颜色</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
+#, fuzzy
 msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
 msgstr ""
 "账户\n"
 "组\n"
@@ -956,7 +969,7 @@ msgstr ""
 "MUC 定向的\n"
 "消息"
 
-#: ../data/glade/gajim_themes_window.glade.h:17 ../src/tooltips.py:628
+#: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
 msgstr "已暂停"
 
@@ -1095,14 +1108,14 @@ msgstr "拒绝"
 msgid "Invitation Received"
 msgstr "收到邀请"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1117
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 msgid "Join Group Chat"
 msgstr "加入群聊"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 #: ../data/glade/manage_bookmarks_window.glade.h:4
 #: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Nickname:"
 msgstr "昵称："
 
@@ -1120,8 +1133,8 @@ msgstr "最近："
 msgid "Room:"
 msgstr "房间："
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1146
-#: ../src/disco.py:1513
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
+#: ../src/disco.py:1517
 msgid "_Join"
 msgstr "加入(_J)"
 
@@ -1172,7 +1185,7 @@ msgstr "代理服务器模板管理"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:27
 msgid "Name:"
 msgstr "名称："
 
@@ -1188,14 +1201,14 @@ msgstr "使用验证"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "点这里插入表情符 (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1093
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1099
 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:10
-#: ../data/glade/subscription_request_window.glade.h:5
+#: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "动作(_A)"
 
@@ -1294,10 +1307,12 @@ msgid "Auto _not available after:"
 msgstr "自动不可用(_N)："
 
 #: ../data/glade/preferences_window.glade.h:24
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
 "每次 Gajim 启动时自动探测\n"
@@ -1305,18 +1320,14 @@ msgstr ""
 "总是使用 KDE 默认应用\n"
 "自定义"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:29
 msgid "B_efore nickname:"
 msgstr "在昵称前：(_E)"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:834
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
 msgid "Chat"
 msgstr "聊天"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Chat state noti_fications:"
-msgstr "聊天状态指示(_F)："
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1327,39 +1338,58 @@ msgstr ""
 "请谨慎使用。"
 
 #: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Default Status Messages"
 msgstr "状态消息"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Default status _iconset:"
 msgstr "默认状态图标设置:(_I)"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid "Display a_vatars of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display status _messages of contacts in roster"
 msgstr "显示名单中联系人的状态消息(_M)"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
+#, fuzzy
+msgid "Displayed Chat state noti_fications:"
+msgstr "聊天状态指示(_F)："
+
+#: ../data/glade/preferences_window.glade.h:39
 msgid "E_very 5 minutes"
 msgstr "每 5 分钟(_V)"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
 msgstr "表情符："
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "事件"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定发给第三方的角"
+"色。"
+
+#: ../data/glade/preferences_window.glade.h:43
 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 "
@@ -1368,59 +1398,59 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定发给第三方的角"
 "色。"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr "Gajim 会自动弹出相关窗口以显示新的事件"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:45
 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:43
+#: ../data/glade/preferences_window.glade.h:46
 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:44
+#: ../data/glade/preferences_window.glade.h:47
 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:45
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim 仅会改变触发了新事件的联系人图标"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:52
 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:50
+#: ../data/glade/preferences_window.glade.h:53
 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:51
+#: ../data/glade/preferences_window.glade.h:54
 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, "
@@ -1429,17 +1459,21 @@ msgstr ""
 "如果选定，Gajim 会以协议特定方式显示状态图标。(例如，MSN 联系人会以 MSN 相同"
 "图标方式显示，以表示在线，离开，忙，等等...)"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:55
 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:53
+#: ../data/glade/preferences_window.glade.h:56
+msgid "Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Ma_nage..."
 msgstr "管理...(_N)"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Never\n"
 "Always\n"
@@ -1451,84 +1485,95 @@ msgstr ""
 "每一个帐号\n"
 "每种类型"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Notify me about contacts that: "
 msgstr "提醒我关于联系人："
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:63
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "发送新的 Gmail 邮件进行通知(_G)"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:64
 msgid "On every _message"
 msgstr "对于每条消息(_M)"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:65
 msgid "One message _window:"
 msgstr "消息窗口：(_W)"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Outgoing Chat state noti_fications:"
+msgstr "聊天状态指示(_F)："
+
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Play _sounds"
 msgstr "播放声音(_S)"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Preferences"
 msgstr "参数"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Print time:"
 msgstr "显示时间："
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Save _position and size for roster and chat windows"
 msgstr "保存名单和聊天窗口的位置及大小(_P)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Show only in _roster"
 msgstr "只显示名单中(_R)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Sign _in"
 msgstr "登录(I)"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Sign _out"
 msgstr "退出登录"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:75
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
 msgstr "状态"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:77
 msgid "T_heme:"
 msgstr "主题：(_H)"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:78
 msgid "The auto away status message"
 msgstr "自动离开状态消息"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:79
 msgid "The auto not available status message"
 msgstr "自动不可用状态消息"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Use _transports iconsets"
 msgstr "使用代理的图标设定(_T)"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "使用托盘图标(aka. 提示区域图表)(_R)"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:83
 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 "
@@ -1538,96 +1583,102 @@ msgstr ""
 "下列方式可用来提示您收到新的事件（消息，文件传输请求等）。请注意，只有未和您"
 "进行聊天的用户发送的新消息才会触发新消息事件"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "当新事件发生时"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "高级设置编辑器"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_After time:"
 msgstr "在该时间后：(_A)"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Before time:"
 msgstr "在该时间前：(_B)"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Browser:"
 msgstr "浏览器(_B)："
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_File manager:"
 msgstr "文件管理器：(_F)"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Font:"
 msgstr "字号：(_F)"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Highlight misspelled words"
 msgstr "拼写检查(_H)"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Ignore events from contacts not in the roster"
 msgstr "忽略名单以外的联系人触发的事件(_I)"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Incoming message:"
 msgstr "抵达的消息：(_I)"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Log status changes of contacts"
 msgstr "记录联系人状态变化(_L)"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Mail client:"
 msgstr "邮件客户端(_M)："
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Never"
 msgstr "从不(_N)"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Notify me about it"
 msgstr "提醒我(_N)"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Open..."
 msgstr "打开...(_O)"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Outgoing message:"
 msgstr "将要送出的消息：(_O)"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Player:"
 msgstr "参与者(_P)"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Pop it up"
 msgstr "弹出(_P)"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Reset to Default Colors"
 msgstr "恢复为默认颜色设置(_R)"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Sort contacts by status"
 msgstr "按状态分类联系人(_S)"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Status message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_URL:"
 msgstr "URL：(_U)"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:107
 msgid "minutes"
 msgstr "分钟"
 
@@ -1658,7 +1709,7 @@ msgstr ""
 msgid "Active on each startup"
 msgstr "Gajim 启动是连接(_O)"
 
-#: ../data/glade/privacy_list_window.glade.h:6 ../src/config.py:2565
+#: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
 msgstr ""
 
@@ -1676,7 +1727,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "服务器："
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1793
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 #, fuzzy
 msgid "Privacy List"
 msgstr "封禁名单"
@@ -1745,116 +1796,116 @@ msgid "City:"
 msgstr "城市："
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "公司："
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "Country:"
 msgstr "国家："
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Department:"
 msgstr "部门："
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #: ../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
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Extra Address:"
 msgstr "附加地址："
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 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
+#: ../data/glade/vcard_information_window.glade.h:19
 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
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Given:"
 msgstr "教名："
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "Homepage:"
 msgstr "主页："
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Middle:"
 msgstr "中间："
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "More"
 msgstr "更多"
 
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:30
 #, fuzzy
 msgid "Personal Info"
 msgstr "个人信息"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Phone No.:"
 msgstr "电话号码："
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "Position:"
 msgstr "位置："
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "Postal Code:"
 msgstr "邮政编码："
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Prefix:"
 msgstr "前缀："
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36 ../src/vcard.py:253
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "角色："
 
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "State:"
 msgstr "州："
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Street:"
 msgstr "街道："
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Suffix:"
 msgstr "后缀："
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/glade/vcard_information_window.glade.h:45
 msgid "Work"
 msgstr "工作"
 
@@ -1895,47 +1946,54 @@ 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
+#: ../src/roster_window.py:1996
 msgid "Edit _Groups"
 msgstr "编辑群组"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:1732
-msgid "In_vite to"
+#: ../src/roster_window.py:2131
+msgid "Execute Command..."
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../src/roster_window.py:1954
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "发送单条消息(_M)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "开始群聊(_C)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "允许他人看到我的状态"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "禁止他人看到我的状态"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1873
+#. Remove group
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1948 ../src/roster_window.py:2045
+#: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "从名单中移除(_R)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:2140
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Subscription"
 msgstr "认证(_S)"
 
@@ -1981,8 +2039,8 @@ msgstr "内容(_C)"
 msgid "_Discover Services"
 msgstr "发掘服务(_D)"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1251
-#: ../src/roster_window.py:1853
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
+#: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "编辑(_E)"
 
@@ -2072,34 +2130,40 @@ msgid "_Send & Close"
 msgstr "发送并关闭(_S)"
 
 #: ../data/glade/subscription_request_window.glade.h:1
+#, fuzzy
+msgid "Au_thorize"
+msgstr "授权(_A)"
+
+#: ../data/glade/subscription_request_window.glade.h:2
 msgid "Authorize contact so he can know when you're connected"
 msgstr "向联系人授权，使他知道您是否连接"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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:3
+#: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
 msgstr "认证请求"
 
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Authorize"
-msgstr "授权(_A)"
-
 #: ../data/glade/subscription_request_window.glade.h:7
 msgid "_Deny"
 msgstr "拒绝(_D)"
 
-#: ../data/glade/systray_context_menu.glade.h:2
+#: ../data/glade/systray_context_menu.glade.h:1
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Wav声音"
+
+#: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "显示所有未决事件"
 
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
 msgstr "显示名单(_R)"
 
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "状态(_T)"
 
@@ -2112,38 +2176,43 @@ msgstr "请求："
 msgid "Client:"
 msgstr "客户端："
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "Comments"
+msgstr "注释： %s"
+
+#: ../data/glade/vcard_information_window.glade.h:11
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "联系人"
 
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:414
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "OS:"
 msgstr "操作系统："
 
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:36
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "资源："
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/glade/vcard_information_window.glade.h:39
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "状态："
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Subscription:"
 msgstr "认证："
 
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "记录聊天历史(_L)"
@@ -2337,7 +2406,7 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1453
+#: ../src/chat_control.py:201 ../src/dialogs.py:1497
 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 "
@@ -2365,316 +2434,321 @@ msgstr "连接不可用"
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: ../src/chat_control.py:834
+#: ../src/chat_control.py:839
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1025
 #, fuzzy, python-format
-msgid "%(nickname)s from room %(room_name)s"
+msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s： %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1107
+#: ../src/chat_control.py:1113
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr " %s 没有广播 OpenPGP 公钥或您未指定"
 
-#: ../src/chat_control.py:1234
+#: ../src/chat_control.py:1239
 msgid "Encryption enabled"
 msgstr "启用加密"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1244
 msgid "Encryption disabled"
 msgstr "禁用加密"
 
 #. add_to_roster_menuitem
-#: ../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
+#: ../src/chat_control.py:1386 ../src/conversation_textview.py:487
+#: ../src/dialogs.py:629 ../src/gajim.py:725 ../src/gajim.py:726
+#: ../src/gajim.py:1065 ../src/roster_window.py:328
+#: ../src/roster_window.py:404 ../src/roster_window.py:1642
+#: ../src/roster_window.py:1823 ../src/roster_window.py:2399
+#: ../src/roster_window.py:2598 ../src/roster_window.py:2609
+#: ../src/roster_window.py:3831 ../src/roster_window.py:3833
+#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
+#: ../src/common/helpers.py:246
 msgid "Not in Roster"
 msgstr "不在名单中"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1526
+#: ../src/chat_control.py:1530
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "收到一条来自 “%s” 的消息"
 
-#: ../src/chat_control.py:1527
+#: ../src/chat_control.py:1531
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
 
-#: ../src/config.py:127 ../src/config.py:564
+#: ../src/config.py:129 ../src/config.py:588
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../src/config.py:205
+#: ../src/config.py:215
 #, python-format
 msgid "Every %s _minutes"
 msgstr "每 %s 分钟(m)"
 
-#: ../src/config.py:336
+#: ../src/config.py:357
 msgid "Active"
 msgstr "活动"
 
-#: ../src/config.py:344
+#: ../src/config.py:365
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:654 ../src/gajim.py:1978
+#: ../src/config.py:678 ../src/gajim.py:2072
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "连接不可用"
 
-#: ../src/config.py:655 ../src/gajim.py:1979
+#: ../src/config.py:679 ../src/gajim.py:2073
 #, 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
+#: ../src/config.py:1031
 msgid "status message title"
 msgstr "状态消息标题"
 
-#: ../src/config.py:993
+#: ../src/config.py:1031
 msgid "status message text"
 msgstr "状态消息文本"
 
-#: ../src/config.py:1028
+#: ../src/config.py:1066
 msgid "First Message Received"
 msgstr "最初收到的消息"
 
-#: ../src/config.py:1029
+#: ../src/config.py:1067
 msgid "Next Message Received"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:1030
+#: ../src/config.py:1068
 msgid "Contact Connected"
 msgstr "已连接的联系人"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1069
 msgid "Contact Disconnected"
 msgstr "联系人已断开连接"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1070
 msgid "Message Sent"
 msgstr "消息已发送"
 
-#: ../src/config.py:1033
+#: ../src/config.py:1071
 msgid "Group Chat Message Highlight"
 msgstr "群聊消息突出显示"
 
-#: ../src/config.py:1034
+#: ../src/config.py:1072
 msgid "Group Chat Message Received"
 msgstr "收到的群聊消息"
 
-#: ../src/config.py:1234
+#: ../src/config.py:1079
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "收到邀请"
+
+#: ../src/config.py:1282
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP 在本机不可用"
 
-#: ../src/config.py:1280
+#: ../src/config.py:1328
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1281
+#: ../src/config.py:1329
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:1284 ../src/config.py:1868
+#: ../src/config.py:1332 ../src/config.py:1924
 msgid "Unread events"
 msgstr "未读取的事件"
 
-#: ../src/config.py:1285
+#: ../src/config.py:1333
 msgid "To change the account name, you must read all pending events."
 msgstr "如要更改账户名称，需先处理所有未决事件"
 
-#: ../src/config.py:1289
+#: ../src/config.py:1337
 msgid "Account Name Already Used"
 msgstr "帐户名已经被占用"
 
-#: ../src/config.py:1290
+#: ../src/config.py:1338
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/config.py:1294 ../src/config.py:1298
+#: ../src/config.py:1342 ../src/config.py:1346
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1295
+#: ../src/config.py:1343
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1299
+#: ../src/config.py:1347
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:1307 ../src/config.py:1313 ../src/config.py:1322
-#: ../src/config.py:2952
+#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
+#: ../src/config.py:3029
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/config.py:1314
+#: ../src/config.py:1362
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
 
-#: ../src/config.py:1372
+#: ../src/config.py:1421
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:1373
+#: ../src/config.py:1422
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:1496 ../src/common/config.py:354
+#: ../src/config.py:1548 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: ../src/config.py:1506
+#: ../src/config.py:1558
 msgid "Relogin now?"
 msgstr "现在重新登录？"
 
-#: ../src/config.py:1507
+#: ../src/config.py:1559
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有调整立即生效，您必须重新登录。"
 
-#: ../src/config.py:1533
+#: ../src/config.py:1585
 msgid "No such account available"
 msgstr "没有有效账户"
 
-#: ../src/config.py:1534
+#: ../src/config.py:1586
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../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
+#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/disco.py:417 ../src/profile_window.py:307
+#: ../src/profile_window.py:373
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: ../src/config.py:1541
+#: ../src/config.py:1594
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:1545
+#: ../src/config.py:1598
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1546
+#: ../src/config.py:1599
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:1570 ../src/config.py:3326
+#: ../src/config.py:1623 ../src/config.py:3416
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:1571 ../src/config.py:3327
+#: ../src/config.py:1624 ../src/config.py:3417
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "在取回 OpenPGP 密钥时发生错误。"
 
-#: ../src/config.py:1574 ../src/config.py:3330
+#: ../src/config.py:1627 ../src/config.py:3420
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密钥选择"
 
-#: ../src/config.py:1575 ../src/config.py:3331
+#: ../src/config.py:1628 ../src/config.py:3421
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 钥匙"
 
 #. Name column
-#: ../src/config.py:1804 ../src/disco.py:736 ../src/disco.py:1462
-#: ../src/history_window.py:78
+#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "名称"
 
-#: ../src/config.py:1807
+#: ../src/config.py:1861
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1925
 msgid "Read all pending events before removing this account."
 msgstr "移除帐号前请阅读所有未决事件。"
 
-#: ../src/config.py:1903
+#: ../src/config.py:1962
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "没有活动的账户"
 
-#: ../src/config.py:1904
+#: ../src/config.py:1963
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1959
+#: ../src/config.py:2022
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "帐户名已经被占用"
 
-#: ../src/config.py:1959
+#: ../src/config.py:2023
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2255
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:2187
+#: ../src/config.py:2257
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
 #. list at the begining
-#: ../src/config.py:2258
+#: ../src/config.py:2329
 msgid "Ban List"
 msgstr "封禁名单"
 
-#: ../src/config.py:2259
+#: ../src/config.py:2330
 msgid "Member List"
 msgstr "成员列表"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2331
 msgid "Owner List"
 msgstr "房主列表"
 
-#: ../src/config.py:2261
+#: ../src/config.py:2332
 msgid "Administrator List"
 msgstr "管理员列表"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2294 ../src/disco.py:743 ../src/history_manager.py:150
+#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2302
+#: ../src/config.py:2373
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2378
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/config.py:2311
+#: ../src/config.py:2382
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2403
 msgid "Banning..."
 msgstr "封禁..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2334
+#: ../src/config.py:2405
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2682,11 +2756,11 @@ msgstr ""
 "<b>想做封禁谁？</b>\n"
 "\n"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2407
 msgid "Adding Member..."
 msgstr "正在添加成员..."
 
-#: ../src/config.py:2337
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2694,11 +2768,11 @@ msgstr ""
 "<b>想要将谁加为成员？</b>\n"
 "\n"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2410
 msgid "Adding Owner..."
 msgstr "添加房主..."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2706,11 +2780,11 @@ msgstr ""
 "<b>想要将谁加为房主？</b>\n"
 "\n"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2413
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
 
-#: ../src/config.py:2343
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2718,7 +2792,7 @@ msgstr ""
 "<b>想要指定谁为管理员？</b>\n"
 "\n"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2415
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2734,88 +2808,98 @@ msgstr ""
 "4. domain (该域本身匹配, 例如任何 user@domain,\n"
 "domain/resource, 或者地址包含一个子域."
 
-#: ../src/config.py:2449
+#: ../src/config.py:2520
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2466 ../src/roster_window.py:2370
+#: ../src/config.py:2537 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2467 ../src/roster_window.py:2371
+#: ../src/config.py:2538 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2468 ../src/roster_window.py:2372
+#: ../src/config.py:2539 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2553
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2554
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，将会丢失连接"
 
-#: ../src/config.py:2566
+#: ../src/config.py:2638
+#, fuzzy
+msgid "Default"
+msgstr "删除"
+
+#: ../src/config.py:2638
+#, fuzzy
+msgid "?print_status:All"
+msgstr "显示时间："
+
+#: ../src/config.py:2639
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2636
+#: ../src/config.py:2709
 #, fuzzy
 msgid "New Group Chat"
 msgstr "群聊"
 
-#: ../src/config.py:2667
+#: ../src/config.py:2741
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:2668
+#: ../src/config.py:2742
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
 
-#: ../src/config.py:2928
+#: ../src/config.py:3004
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3005
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:2938 ../src/dialogs.py:1276
+#: ../src/config.py:3015 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/config.py:2939
+#: ../src/config.py:3016
 msgid "You must enter a password for the new account."
 msgstr "必须为新账户输入密码。"
 
-#: ../src/config.py:2943 ../src/dialogs.py:1281
+#: ../src/config.py:3020 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: ../src/config.py:2944 ../src/dialogs.py:1282
+#: ../src/config.py:3021 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "两次密码输入不一致。"
 
-#: ../src/config.py:2963
+#: ../src/config.py:3040
 msgid "Duplicate Jabber ID"
 msgstr "复制 Jabber ID"
 
-#: ../src/config.py:2964
+#: ../src/config.py:3041
 msgid "This account is already configured in Gajim."
 msgstr "此帐号已在 Gajim 中配置过。"
 
-#: ../src/config.py:2981
+#: ../src/config.py:3058
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
 
-#: ../src/config.py:2982 ../src/config.py:3015
+#: ../src/config.py:3059 ../src/config.py:3094
 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."
@@ -2823,276 +2907,285 @@ msgstr ""
 "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单"
 "项。"
 
-#: ../src/config.py:3014
+#: ../src/config.py:3093
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
 
-#: ../src/config.py:3030
+#: ../src/config.py:3111
 msgid "An error occured during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:3087
+#: ../src/config.py:3169
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3170
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 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:342
+#: ../src/conversation_textview.py:340
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "“%s”的动作"
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:352
 msgid "Read _Wikipedia Article"
 msgstr "读取 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:357
 msgid "Look it up in _Dictionary"
 msgstr "从字典(_D)中搜索"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:373
 #, 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:388
+#: ../src/conversation_textview.py:386
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网站搜索地址缺少 “%s”"
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:389
 msgid "Web _Search for it"
 msgstr "用网页搜索(_S)"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:395
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:752
 msgid "Yesterday"
 msgstr "昨天"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:706
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "%i days ago"
 msgstr "%i 天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:785
+#: ../src/conversation_textview.py:788
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题：%s\n"
 
-#: ../src/dialogs.py:58
+#: ../src/dialogs.py:59
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "联系人名称：<i>%s</i>"
 
-#: ../src/dialogs.py:60
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../src/dialogs.py:61
+#, fuzzy, python-format
+msgid "Jabber ID: <i>%s</i>"
 msgstr "JID： <i>%s</i>"
 
-#: ../src/dialogs.py:210
+#: ../src/dialogs.py:211
 msgid "Group"
 msgstr "群组"
 
-#: ../src/dialogs.py:217
+#: ../src/dialogs.py:218
 msgid "In the group"
 msgstr "群组内"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:269
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:271
+#: ../src/dialogs.py:272
 msgid "Contact name"
 msgstr "联系人名"
 
-#: ../src/dialogs.py:316
+#: ../src/dialogs.py:318
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 状态消息"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:320
 msgid "Status Message"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:395
 msgid "Save as Preset Status Message"
 msgstr "<b>保存为预设状态消息</b>"
 
-#: ../src/dialogs.py:394
+#: ../src/dialogs.py:396
 msgid "Please type a name for this status message"
 msgstr "请为该状态信息键入名称："
 
-#: ../src/dialogs.py:415
+#: ../src/dialogs.py:417
 #, fuzzy
 msgid "AIM Address:"
 msgstr "地址(_A):"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:418
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:419
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:420
 #, fuzzy
 msgid "MSN Address:"
 msgstr "地址(_A):"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:421
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "附加地址："
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:457
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "请为账户 %s 填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:459
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想增加的联系人数据"
 
-#: ../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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:490 ../src/roster_window.py:267
+#: ../src/roster_window.py:325 ../src/roster_window.py:364
+#: ../src/roster_window.py:445 ../src/roster_window.py:477
+#: ../src/roster_window.py:479 ../src/roster_window.py:3827
+#: ../src/roster_window.py:3829 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "代理"
 
-#: ../src/dialogs.py:607 ../src/dialogs.py:613
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "无效的用户 ID"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:616
 msgid "The user ID must not contain a resource."
 msgstr "该用户 ID 不可包含任何源"
 
-#: ../src/dialogs.py:628
+#: ../src/dialogs.py:630
 msgid "Contact already in roster"
 msgstr "联系人已经在名单中"
 
-#: ../src/dialogs.py:629
+#: ../src/dialogs.py:631
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已在名单中。"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:665
 #, fuzzy
 msgid "User ID:"
 msgstr "用户 ID"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:728
 msgid "A GTK+ jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:729
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:730
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:744
 #, fuzzy
 msgid "Current Developers:"
 msgstr "既往开发作者："
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:746
 msgid "Past Developers:"
 msgstr "既往开发作者："
 
-#: ../src/dialogs.py:736
+#: ../src/dialogs.py:756
 msgid "THANKS:"
 msgstr "感谢："
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:742
+#: ../src/dialogs.py:762
 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:756
+#: ../src/dialogs.py:776
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
 "kangkang <kanger@gmail.com>"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:906
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "无法加入房间"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:907
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1058
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "该认证要求来自帐户 %s 由 %s 发送"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 #, python-format
 msgid "Subscription request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../src/dialogs.py:1092 ../src/roster_window.py:599
-#, python-format
-msgid "You are already in room %s"
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, fuzzy, python-format
+msgid "You are already in group chat %s"
 msgstr "房间“%s”已在您的书签中。"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1129
 msgid "You can not join a group chat unless you are connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 #, fuzzy
-msgid "Invalid room Jabber ID"
+msgid "Invalid group chat Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 #, fuzzy
-msgid "The room Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID has not allowed characters."
 msgstr "房间名或服务器名包含了非法字符。"
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1225
+msgid "This is not a group chat"
+msgstr ""
+
+#: ../src/dialogs.py:1226
+#, fuzzy, python-format
+msgid "%s is not the name of a group chat."
+msgstr "在群聊窗口中隐藏标语"
+
+#: ../src/dialogs.py:1248
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1250
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1251
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3102,308 +3195,336 @@ msgstr ""
 "联系人 ID："
 
 #. if offline or connecting
-#: ../src/dialogs.py:1236 ../src/dialogs.py:1591 ../src/dialogs.py:1715
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:1237 ../src/dialogs.py:1592 ../src/dialogs.py:1716
+#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认已连接到 “%s”。"
 
-#: ../src/dialogs.py:1246 ../src/dialogs.py:1249
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 #, fuzzy
 msgid "Invalid JID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/dialogs.py:1249
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1258
+#: ../src/dialogs.py:1298
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1317
 msgid "You must enter a password."
 msgstr "此处必须输入密码"
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1324 ../src/notify.py:211 ../src/notify.py:413
+#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: ../src/dialogs.py:1326 ../src/notify.py:219 ../src/notify.py:415
+#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
 #. chat message
-#: ../src/dialogs.py:1328 ../src/notify.py:238 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "新消息"
 
 #. single message
-#: ../src/dialogs.py:1328 ../src/notify.py:223 ../src/notify.py:417
+#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
 msgid "New Single Message"
 msgstr "新消息"
 
 #. private message
-#: ../src/dialogs.py:1329 ../src/notify.py:230 ../src/notify.py:418
+#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
 msgid "New Private Message"
 msgstr "新的个人消息"
 
-#: ../src/dialogs.py:1329 ../src/gajim.py:1099 ../src/notify.py:426
+#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "新的电子邮件"
 
-#: ../src/dialogs.py:1331 ../src/gajim.py:1231 ../src/notify.py:420
+#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: ../src/dialogs.py:1333 ../src/gajim.py:1073 ../src/gajim.py:1207
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: ../src/dialogs.py:1335 ../src/gajim.py:1267 ../src/gajim.py:1289
-#: ../src/gajim.py:1306 ../src/notify.py:424
+#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
+#: ../src/gajim.py:1378 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: ../src/dialogs.py:1336 ../src/gajim.py:1270 ../src/notify.py:424
+#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:1338 ../src/gajim.py:971 ../src/notify.py:428
+#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "群聊邀请"
 
-#: ../src/dialogs.py:1340 ../src/notify.py:203 ../src/notify.py:430
+#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "联系人退出登录"
 
-#: ../src/dialogs.py:1521
+#: ../src/dialogs.py:1565
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "账户 %s 的消息"
 
-#: ../src/dialogs.py:1523
+#: ../src/dialogs.py:1567
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "账户 %s 的消息"
 
-#: ../src/dialogs.py:1525
+#: ../src/dialogs.py:1569
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1528
+#: ../src/dialogs.py:1572
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1551
+#: ../src/dialogs.py:1595
 #, 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:1618
+#: ../src/dialogs.py:1667
 #, python-format
 msgid "RE: %s"
 msgstr "回复： %s"
 
-#: ../src/dialogs.py:1619
+#: ../src/dialogs.py:1668
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道：\n"
 
-#: ../src/dialogs.py:1663
+#: ../src/dialogs.py:1712
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:1665
+#: ../src/dialogs.py:1714
 msgid "XML Console"
 msgstr " XML 控制台"
 
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:1839
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1887
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1841
+#: ../src/dialogs.py:1890
 #, fuzzy, python-format
 msgid "Order: %s, action: %s"
 msgstr "描述： %s"
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1932
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>行格式</b>"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>行格式</b>"
 
-#: ../src/dialogs.py:2062
+#: ../src/dialogs.py:2115
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2064
+#: ../src/dialogs.py:2117
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "私聊"
 
+#: ../src/dialogs.py:2185
+#, fuzzy
+msgid "Invalid List Name"
+msgstr "无效用户名"
+
+#: ../src/dialogs.py:2186
+#, fuzzy
+msgid "You must enter a name to create a privacy list."
+msgstr "必须为新账户输入密码。"
+
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2155
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../src/dialogs.py:2220
+#, fuzzy, python-format
+msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 房间"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2226
 #, python-format
 msgid "Comment: %s"
 msgstr "注释： %s"
 
-#: ../src/dialogs.py:2223
+#: ../src/dialogs.py:2288
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:2233 ../src/dialogs.py:2278
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/dialogs.py:2238
+#: ../src/dialogs.py:2303
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2333
 msgid "Choose Image"
 msgstr "选择形象"
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2348
 msgid "Images"
 msgstr "形象"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2405
 #, python-format
 msgid "When %s becomes:"
 msgstr "当 %s 变为："
 
-#: ../src/dialogs.py:2342
+#: ../src/dialogs.py:2407
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在为 %s 添加特殊通告"
 
 #. # means number
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2419
+#: ../src/dialogs.py:2484
 #, fuzzy
 msgid "Condition"
 msgstr "连接"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:99
+#: ../src/disco.py:101
 msgid "Others"
 msgstr "其他"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:103
+#: ../src/disco.py:105
 msgid "Conference"
 msgstr "会议"
 
-#: ../src/disco.py:415
+#: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: ../src/disco.py:494
+#: ../src/disco.py:497
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帐号 %s 来发掘服务"
 
-#: ../src/disco.py:496
+#: ../src/disco.py:499
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:641
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:642
 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:642 ../src/disco.py:923
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:647
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: ../src/disco.py:723
+#: ../src/disco.py:727
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "浏览 %s 在帐户 %s 上"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:766
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:928
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1138 ../src/disco.py:1253
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1290
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "已扫描 %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1471
+#: ../src/disco.py:1475
 msgid "Users"
 msgstr "用户"
 
 #. Description column
-#: ../src/disco.py:1478
+#: ../src/disco.py:1482
 msgid "Description"
 msgstr "描述"
 
 #. Id column
-#: ../src/disco.py:1485
+#: ../src/disco.py:1489
 msgid "Id"
 msgstr ""
 
+#: ../src/disco.py:1712
+#, fuzzy
+msgid "Subscribed"
+msgstr "认证"
+
+#: ../src/disco.py:1738
+msgid "New post"
+msgstr ""
+
+#: ../src/disco.py:1744
+msgid "_Subscribe"
+msgstr "认证(_S)"
+
+#: ../src/disco.py:1750
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "认证(_S)"
+
 #: ../src/filetransfers_window.py:72
 msgid "File"
 msgstr "文件"
@@ -3429,7 +3550,7 @@ 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:459
+#: ../src/history_manager.py:463
 msgid "You"
 msgstr "您"
 
@@ -3439,7 +3560,7 @@ msgid "Sender: %s"
 msgstr "发送者： %s"
 
 #: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:600
+#: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "接收者： %s"
 
@@ -3506,31 +3627,31 @@ msgstr "描述： %s"
 msgid "%s wants to send you a file:"
 msgstr "%s 想发送给您一个文件："
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:675
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:677
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:681
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
 msgid "What do you want to do?"
 msgstr "想做什么？"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:691
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:692
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3566,12 +3687,11 @@ msgstr "文件："
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:422
-#: ../src/tooltips.py:590
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "名称："
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:594
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "发送者："
 
@@ -3579,52 +3699,52 @@ msgstr "发送者："
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:47
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "运行 Gajim 需要 X 服务器。退出..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:51
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim 需要 PyGTK 2.6 或更高版本"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 PyGTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:55
+#: ../src/gajim.py:54
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim 需要 GTK 2.6 或更高版本"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 GTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:61
+#: ../src/gajim.py:60
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ 运行时环境缺少 libglade 支持"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:62
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr "请移除当前的 GTK+ 运行时环境并从 %s 安装最新稳定版本"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:64
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "请确认您系统中 gtk+ 及 pygtk 对 libglade 的支持。"
 
-#: ../src/gajim.py:70
+#: ../src/gajim.py:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "运行 Gajim 需要 PySQLite2 "
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:76
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "运行 Gajim 需要 PySQLite2 "
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:77
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3632,86 +3752,86 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:158
+#: ../src/gajim.py:189
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:190
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:297
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) 授权给 %s (id: %s)"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:298
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gajim.py:306 ../src/notify.py:432
+#: ../src/gajim.py:344 ../src/notify.py:430
 #, fuzzy
 msgid "Connection Failed"
 msgstr "连接"
 
-#: ../src/gajim.py:609
+#: ../src/gajim.py:656
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "主题：%s\n"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:701
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "发送 %s ( %s ) 时出现错误"
 
-#: ../src/gajim.py:694
+#: ../src/gajim.py:741
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: ../src/gajim.py:695
+#: ../src/gajim.py:742
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人“%s”已授权您查看他/她的状态。"
 
-#: ../src/gajim.py:703
+#: ../src/gajim.py:750
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人“%s”移除了来自您的认证"
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:751
 msgid "You will always see him or her as offline."
 msgstr "您将一直看到他/她的状态为离线。"
 
-#: ../src/gajim.py:747
+#: ../src/gajim.py:794
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与对方“ %s ”建立连接。"
 
-#: ../src/gajim.py:748 ../src/common/connection.py:389
+#: ../src/gajim.py:795 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "检查连接并稍后重试。"
 
-#: ../src/gajim.py:893 ../src/roster_window.py:1105
+#: ../src/gajim.py:943 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s 正在 %s (%s)."
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1040
 msgid "Your passphrase is incorrect"
 msgstr "您的密文不正确"
 
-#: ../src/gajim.py:982
+#: ../src/gajim.py:1041
 msgid "You are currently connected without your OpenPGP key."
 msgstr "已建立没有 OpenPGP 密钥的连接"
 
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1143
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr " %(gmail_mail_address)s 上的新邮件"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1145
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3720,56 +3840,61 @@ 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
+#: ../src/gajim.py:1154
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1228
+#: ../src/gajim.py:1297
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gajim.py:1290
+#: ../src/gajim.py:1362
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "你成功的从 %(name)s 收到文件  %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1294
+#: ../src/gajim.py:1366
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1307
+#: ../src/gajim.py:1379
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1383
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1413
+#: ../src/gajim.py:1489
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1414
+#: ../src/gajim.py:1490
 #, 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
+#: ../src/gajim.py:1828
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: ../src/gajim.py:1998
+#: ../src/gajim.py:2020
+#, fuzzy
+msgid "Network Manager support not available"
+msgstr "连接不可用"
+
+#: ../src/gajim.py:2095
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "会话管理器支持不可用(丢失 gnome.ui 模块)"
 
@@ -3792,7 +3917,8 @@ msgid "Shows or hides the roster window"
 msgstr "显示/隐藏名单窗口"
 
 #: ../src/gajim-remote.py:78
-msgid "Popups a window with the next unread message"
+#, fuzzy
+msgid "Popups a window with the next pending event"
 msgstr "为下一条未读消息弹出窗口"
 
 #: ../src/gajim-remote.py:82
@@ -4111,8 +4237,8 @@ msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
 #: ../src/groupchat_control.py:122
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "您不再在房间“%s”中或“%s”已离开。"
 
 #: ../src/groupchat_control.py:141
@@ -4129,151 +4255,152 @@ msgid "Insert Nickname"
 msgstr "更换昵称(_N)"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:784
+#: ../src/groupchat_control.py:789
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:788
+#: ../src/groupchat_control.py:793
 #, 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:795
+#: ../src/groupchat_control.py:800
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:799
+#: ../src/groupchat_control.py:804
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:807
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py:809
+#: ../src/groupchat_control.py:814
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s 现在成了 %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:894
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
 
-#: ../src/groupchat_control.py:895
-#, python-format
-msgid "%s has joined the room"
-msgstr ""
+#: ../src/groupchat_control.py:899
+#, fuzzy, python-format
+msgid "%s has joined the group chat"
+msgstr "群组内"
 
 #. No status message
-#: ../src/groupchat_control.py:897 ../src/roster_window.py:1108
+#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s 正在 %s"
 
-#: ../src/groupchat_control.py:1016 ../src/groupchat_control.py:1034
-#: ../src/groupchat_control.py:1127 ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
+#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "昵称未找到： %s "
 
-#: ../src/groupchat_control.py:1050
-msgid "This room has no subject"
+#: ../src/groupchat_control.py:1054
+#, fuzzy
+msgid "This group chat has no subject"
 msgstr "该房间无话题"
 
-#: ../src/groupchat_control.py:1063
+#: ../src/groupchat_control.py:1067
 #, 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:1070 ../src/groupchat_control.py:1098
+#: ../src/groupchat_control.py:1074 ../src/groupchat_control.py:1102
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr " %s 可能不是有效的 JID "
 
-#: ../src/groupchat_control.py:1181
+#: ../src/groupchat_control.py:1185
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "没有此命令：/%s ( 如果想送出，请用请用前缀 /say )"
 
-#: ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "Commands: %s"
 msgstr "命令： %s "
 
-#: ../src/groupchat_control.py:1206
-#, python-format
+#: ../src/groupchat_control.py:1210
+#, fuzzy, 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."
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
 msgstr ""
 "用法：/%s <昵称|JID> [原因]，从此房间封禁 JID。昵称可能被代替，除了包含“@”。"
 "如果 JID 在房间里，他/她/它将被踢出。注意：不支持包含空格的昵称。"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1217
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr "用法：/%s <昵称>, 为指定房主打开一个私聊窗口"
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1221
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "用法：/%s，清除文本窗口。"
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr "用法：/%s [原因]，关闭当前窗口或标签，如果指定将显示原因。"
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1226
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "用法：/%s，隐藏聊天按钮。"
 
-#: ../src/groupchat_control.py:1224
-#, python-format
+#: ../src/groupchat_control.py:1229
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr "用法：/%s <JID> [原因]，邀请 JID 到当前房间，可以提供一个原因。"
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr "用法: /%s <房间>@<服务器>[/昵称], 申请以指定昵称加入“房间@服务器”。"
 
-#: ../src/groupchat_control.py:1232
-#, python-format
+#: ../src/groupchat_control.py:1237
+#, fuzzy, 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."
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
 msgstr ""
 "用法：/%s <昵称> [原因]，通过昵称移除房主，原因可选。注意：不支持含空格的昵"
 "称。"
 
-#: ../src/groupchat_control.py:1237
-#, python-format
+#: ../src/groupchat_control.py:1242
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
 msgstr ""
 "用法：/%s <动作>，发送动作到当前房间。使用第三人称。(例如：/%s exploeds)"
 
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4281,90 +4408,92 @@ msgid ""
 msgstr ""
 "用法： /%s <昵称> [消息], 打开一个私聊窗口并且向指定昵称的联系人发送消息 "
 
-#: ../src/groupchat_control.py:1246
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#: ../src/groupchat_control.py:1251
+#, fuzzy, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "用法：/%s <昵称>，改变昵称。"
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1255
 #, fuzzy, python-format
-msgid "Usage: /%s , display the names of room occupants."
+msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "用法：/%s [主题]，显示或更新房间的主题。"
 
-#: ../src/groupchat_control.py:1254
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../src/groupchat_control.py:1259
+#, fuzzy, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "用法：/%s [主题]，显示或更新房间的主题。"
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1262
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "用法：/%s <消息>，不使用其他命令发送消息。"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid "No help info for /%s"
 msgstr "没有 /%s 的帮助信息"
 
-#: ../src/groupchat_control.py:1309
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../src/groupchat_control.py:1314
+#, fuzzy, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "确定要离开房间“ %s ”？"
 
-#: ../src/groupchat_control.py:1310
-msgid "If you close this window, you will be disconnected from this room."
+#: ../src/groupchat_control.py:1316
+#, fuzzy
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "如果关闭此窗口，您将断开此房间的连接。"
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "不再提问此问题(_N)"
 
-#: ../src/groupchat_control.py:1348
+#: ../src/groupchat_control.py:1354
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1349
+#: ../src/groupchat_control.py:1355
 msgid "Please specify the new subject:"
 msgstr "请指定新话题："
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1364
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1365
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称："
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1390
 msgid "Bookmark already set"
 msgstr "书签已设定"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1391
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "房间“%s”已在您的书签中。"
 
-#: ../src/groupchat_control.py:1395
+#: ../src/groupchat_control.py:1400
 msgid "Bookmark has been added successfully"
 msgstr "书签添加成功"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1401
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以通过“动作”菜单管理您的名单。"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1513
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "Kicking %s"
 msgstr "踢出 %s"
 
-#: ../src/groupchat_control.py:1514 ../src/groupchat_control.py:1797
+#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因："
 
 #. ask for reason
-#: ../src/groupchat_control.py:1796
+#: ../src/groupchat_control.py:1809
 #, python-format
 msgid "Banning %s"
 msgstr "封禁 %s"
@@ -4393,73 +4522,73 @@ msgstr "细节"
 msgid "Error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/gtkgui_helpers.py:284
+#: ../src/gtkgui_helpers.py:293
 msgid "Error reading file:"
 msgstr "读文件错误："
 
-#: ../src/gtkgui_helpers.py:287
+#: ../src/gtkgui_helpers.py:296
 msgid "Error parsing file:"
 msgstr "分析文件错误："
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:325
+#: ../src/gtkgui_helpers.py:334
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "不能写入到 %s 。会话管理支持功能未启用"
 
-#: ../src/gtkgui_helpers.py:720
+#: ../src/gtkgui_helpers.py:727
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:721
+#: ../src/gtkgui_helpers.py:728
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:737
 #, fuzzy
 msgid "Save Image as..."
 msgstr "另存为..."
 
-#: ../src/history_manager.py:60
+#: ../src/history_manager.py:64
 msgid "Cannot find history logs database"
 msgstr "无法找到历史记录数据库"
 
 #. holds jid
-#: ../src/history_manager.py:103
+#: ../src/history_manager.py:107
 msgid "Contacts"
 msgstr "联系人"
 
 #. holds time
-#: ../src/history_manager.py:116 ../src/history_manager.py:156
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "日期"
 
 #. holds nickname
-#: ../src/history_manager.py:122 ../src/history_manager.py:174
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "昵称"
 
 #. holds message
-#: ../src/history_manager.py:130 ../src/history_manager.py:162
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "消息"
 
 #. holds subject
-#: ../src/history_manager.py:137 ../src/history_manager.py:168
+#: ../src/history_manager.py:141 ../src/history_manager.py:172
 msgid "Subject"
 msgstr "主题"
 
-#: ../src/history_manager.py:182
+#: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "您确定要清除数据库？（强烈建议 GAJIM 运行时不要进行此操作）"
 
-#: ../src/history_manager.py:184
+#: ../src/history_manager.py:188
 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 "
@@ -4472,25 +4601,25 @@ msgstr ""
 "\n"
 "如果您点击“是”，请等待..."
 
-#: ../src/history_manager.py:396
+#: ../src/history_manager.py:400
 msgid "Exporting History Logs..."
 msgstr "输出历史记录..."
 
-#: ../src/history_manager.py:472
+#: ../src/history_manager.py:476
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 时说： %(message)s\n"
 
-#: ../src/history_manager.py:510
+#: ../src/history_manager.py:514
 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:514 ../src/history_manager.py:550
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "该操作是不可撤消的。"
 
-#: ../src/history_manager.py:547
+#: ../src/history_manager.py:551
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您确定要删除所选定的消息？"
@@ -4520,11 +4649,11 @@ msgstr "现在状态：%(status)s：%(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "现在状态： %(status)s "
 
-#: ../src/message_window.py:271
+#: ../src/message_window.py:273
 msgid "Messages"
 msgstr "消息"
 
-#: ../src/message_window.py:272
+#: ../src/message_window.py:274
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -4564,397 +4693,471 @@ msgstr "%(nickname)s： %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "来自 %(nickname)s 的新消息"
 
-#: ../src/profile_window.py:75 ../src/profile_window.py:383
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/profile_window.py:210
-#: ../src/profile_window.py:219 ../src/profile_window.py:377
+#: ../src/profile_window.py:107 ../src/profile_window.py:203
+#: ../src/profile_window.py:212 ../src/profile_window.py:370
 msgid "Click to set your avatar"
 msgstr ""
 
 #. keep identation
-#: ../src/profile_window.py:140
+#: ../src/profile_window.py:136
 msgid "Could not load image"
 msgstr "无法读取图片"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:238
 #, fuzzy
 msgid "Information received"
 msgstr "收到邀请"
 
-#: ../src/profile_window.py:315
+#: ../src/profile_window.py:308
 msgid "Without a connection you can not publish your contact information."
 msgstr "无法脱机发布个人信息。"
 
-#: ../src/profile_window.py:327
+#: ../src/profile_window.py:320
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:328
 msgid "Information published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:340
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:347
 msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:348
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "发布您的个人信息时发生错误，请稍后重试。"
 
-#: ../src/profile_window.py:381
+#: ../src/profile_window.py:374
 msgid "Without a connection, you can not get your contact information."
 msgstr "无法脱机获取个人信息。"
 
-#: ../src/roster_window.py:144 ../src/roster_window.py:196
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:306 ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../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"
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
 msgstr "隐身时无法加入房间。"
 
-#. the 'manage gc bookmarks' item is showed
+#. new chat
+#. for chat_with
+#. for single message
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#, python-format
+msgid "using account %s"
+msgstr "使用账户 %s"
+
+#. the 'manage gc bookmarks' item is shown
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:804
+#: ../src/roster_window.py:903
 #, python-format
 msgid "to %s account"
 msgstr "至帐户 %s"
 
 #. disco
-#: ../src/roster_window.py:809
+#: ../src/roster_window.py:908
 #, python-format
 msgid "using %s account"
 msgstr "使用账户 %s"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../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:881
+#: ../src/roster_window.py:983
 #, python-format
 msgid "of account %s"
 msgstr "帐户 %s 的"
 
-#: ../src/roster_window.py:901
+#: ../src/roster_window.py:1003
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "书签管理..."
 
-#: ../src/roster_window.py:930
+#: ../src/roster_window.py:1032
 #, python-format
 msgid "for account %s"
 msgstr "为帐户 %s"
 
 #. History manager
-#: ../src/roster_window.py:951
+#: ../src/roster_window.py:1053
 msgid "History Manager"
 msgstr "历史管理器"
 
-#: ../src/roster_window.py:960
+#: ../src/roster_window.py:1062
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "加入群聊"
 
-#: ../src/roster_window.py:1258 ../src/roster_window.py:3021
-#: ../src/roster_window.py:3027
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
+#: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: ../src/roster_window.py:1259
+#: ../src/roster_window.py:1385
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr "移除帐号前请阅读所有未决事件。"
 
-#: ../src/roster_window.py:1262
+#: ../src/roster_window.py:1388
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理“%s”将被移除"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1389
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr "您将无法从此代理收发消息。"
 
-#: ../src/roster_window.py:1265
+#: ../src/roster_window.py:1392
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "代理“%s”将被移除"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1397
 #, 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
+#. it's jid
+#: ../src/roster_window.py:1417
+#, fuzzy
+msgid "Rename Contact"
+msgstr "联系人"
+
+#: ../src/roster_window.py:1418
+#, fuzzy, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "为账户 %s 输入 GPG 密文字段"
+
+#: ../src/roster_window.py:1425
+#, fuzzy
+msgid "Rename Group"
+msgstr "重命名(_R)"
+
+#: ../src/roster_window.py:1426
+#, fuzzy, python-format
+msgid "Enter a new name for group %s"
+msgstr "为账户 %s 输入 GPG 密文字段"
+
+#: ../src/roster_window.py:1480
+#, fuzzy
+msgid "Remove Group"
+msgstr "移除(_R)"
+
+#: ../src/roster_window.py:1481
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr ""
+
+#: ../src/roster_window.py:1482
+#, fuzzy
+msgid "Remove also all contacts in this group from your roster"
+msgstr "从名单移除联系人"
+
+#: ../src/roster_window.py:1506
 msgid "Assign OpenPGP Key"
 msgstr "指定您的 OpenPGP 钥匙"
 
-#: ../src/roster_window.py:1315
+#: ../src/roster_window.py:1507
 msgid "Select a key to apply to the contact"
 msgstr "选择一个键应用于联系人。"
 
-#: ../src/roster_window.py:1566 ../src/roster_window.py:1741
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 #, fuzzy
-msgid "_New room"
-msgstr "新房间"
+msgid "_New group chat"
+msgstr "群聊"
 
-#: ../src/roster_window.py:1624
+#: ../src/roster_window.py:1846
 msgid "I would like to add you to my roster"
 msgstr "我想加您为好友"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "发送服务器消息(_S)"
+
+#: ../src/roster_window.py:2034
 msgid "Re_name"
 msgstr "重命名(_N)"
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2061
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:2064
+#, fuzzy
+msgid "To all online users"
+msgstr "在线用户(_O)"
+
+#: ../src/roster_window.py:2100
 msgid "_Log on"
 msgstr "登入(_L)"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2110
 msgid "Log _off"
 msgstr "退出登录(_O)"
 
-#: ../src/roster_window.py:1948 ../src/roster_window.py:2010
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:2080
+#: ../src/roster_window.py:2375
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:2081
+#: ../src/roster_window.py:2376
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在“%s”将知道您的状态。"
 
-#: ../src/roster_window.py:2105
+#: ../src/roster_window.py:2400
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:2106
+#: ../src/roster_window.py:2401
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
 
-#: ../src/roster_window.py:2117
+#: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:2118
+#: ../src/roster_window.py:2414
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "“%s” 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2617
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2621
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr "移除此联系人的同时将移除认证，导致他/她将一直看到您为离线。"
 
-#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2626
 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:2334
+#: ../src/roster_window.py:2629
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2338
+#: ../src/roster_window.py:2633
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:2342
+#: ../src/roster_window.py:2637
 #, 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
+#: ../src/roster_window.py:2709
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2710
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "为账户 %s 输入 GPG 密文字段"
 
-#: ../src/roster_window.py:2417
+#: ../src/roster_window.py:2715
 msgid "Save passphrase"
 msgstr "保存密文"
 
-#: ../src/roster_window.py:2425
+#: ../src/roster_window.py:2723
 msgid "Wrong Passphrase"
 msgstr "错误字段"
 
-#: ../src/roster_window.py:2426
+#: ../src/roster_window.py:2724
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "请重新输入您的 GPG 字段或点“取消”"
 
-#: ../src/roster_window.py:2478 ../src/roster_window.py:2537
+#: ../src/roster_window.py:2781 ../src/roster_window.py:2841
 msgid "You are participating in one or more group chats"
 msgstr "您在一或多个群聊中"
 
-#: ../src/roster_window.py:2479 ../src/roster_window.py:2538
+#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
 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:2495
+#: ../src/roster_window.py:2799
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2800
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2898
 #, python-format
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr ""
 
-#: ../src/roster_window.py:3022 ../src/roster_window.py:3028
+#: ../src/roster_window.py:3326 ../src/roster_window.py:3333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr "启用历史后才能再次重读消息"
 
-#: ../src/roster_window.py:3848
+#: ../src/roster_window.py:3911
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3913
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+
+#: ../src/roster_window.py:3955
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr "您必须在与他人聊天前新建账户。"
+
+#: ../src/roster_window.py:3957
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+
+#: ../src/roster_window.py:4124
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "将 %s 放在群 %s 中"
 
-#: ../src/roster_window.py:3855
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "创建 %s 和 %s 元联系人"
 
-#: ../src/roster_window.py:4041
+#: ../src/roster_window.py:4318
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
-#: ../src/systray.py:141
+#: ../src/systray.py:144
 msgid "_Change Status Message..."
 msgstr "更改状态消息_(C)..."
 
-#: ../src/tooltips.py:316
-msgid "Role: "
-msgstr "角色："
+#: ../src/systray.py:234
+msgid "Hide this menu"
+msgstr "隐藏本菜单"
 
-#: ../src/tooltips.py:317
-msgid "Affiliation: "
-msgstr "会籍："
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#, fuzzy
+msgid "Jabber ID: "
+msgstr "Jabber ID"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:449 ../src/tooltips.py:520
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "资源："
 
-#: ../src/tooltips.py:323
+#: ../src/tooltips.py:317
 #, python-format
-msgid "%(owner_or_admin_or_member)s of this room"
+msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#. ('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:434 ../src/tooltips.py:536
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:453 ../src/tooltips.py:637
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "状态"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:461
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr " %s 的最后状态"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:463
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "自 %s"
 
-#: ../src/tooltips.py:516
-#, fuzzy
-msgid "Jabber ID: "
-msgstr "Jabber ID"
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:502
+msgid "Subscription: "
+msgstr "认证："
+
+#: ../src/tooltips.py:512
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:566
 msgid "Download"
 msgstr "下载"
 
-#: ../src/tooltips.py:599
+#: ../src/tooltips.py:572
 msgid "Upload"
 msgstr "上传"
 
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:579
 msgid "Type: "
 msgstr "类型"
 
-#: ../src/tooltips.py:612
+#: ../src/tooltips.py:585
 msgid "Transferred: "
 msgstr "已传输："
 
-#: ../src/tooltips.py:615 ../src/tooltips.py:636
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "未开始"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:592
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:621 ../src/tooltips.py:624
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "已完成"
 
+#: ../src/tooltips.py:601
+msgid "?transfer status:Paused"
+msgstr ""
+
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:632
+#: ../src/tooltips.py:605
 msgid "Stalled"
 msgstr "已冻结"
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:607
 msgid "Transferring"
 msgstr "传输中"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:639
 msgid "This service has not yet responded with detailed information"
 msgstr "服务无详细信息应答"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:642
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4962,180 +5165,180 @@ msgstr ""
 "此服务无法返回详细信息。\n"
 "它可能是继承或损坏的"
 
-#: ../src/vcard.py:204
+#: ../src/vcard.py:217
 msgid "?Client:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:206
+#: ../src/vcard.py:219
 msgid "?OS:Unknown"
 msgstr "?OS: 未知"
 
-#: ../src/vcard.py:227 ../src/vcard.py:427
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:257
+#: ../src/vcard.py:277
 #, fuzzy
 msgid "Affiliation:"
 msgstr "会籍："
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣，但您不关心他/她的状态"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您对此联系人的状态信息感兴趣，但他/她不关心您的状态"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:289
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:271
+#: ../src/vcard.py:291
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:279
+#: ../src/vcard.py:299
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:291 ../src/vcard.py:318 ../src/vcard.py:460
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
-#: ../src/common/check_paths.py:26
+#: ../src/common/check_paths.py:33
 msgid "creating logs database"
 msgstr "建立日志数据库"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s 应为文件但它应为一个目录"
 
-#: ../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:90 ../src/common/check_paths.py:101
+#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
 msgid "Gajim will now exit"
 msgstr "Gajim 即将退出"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s 应为文件但它是一个目录"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:131
 #, python-format
 msgid "creating %s directory"
 msgstr "正在建立 %s 目录"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:55
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "使用 D-Bus 和通知进程显示通知"
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to away."
 msgstr "转换状态为“离开”之前的时间(分钟)。"
 
-#: ../src/common/config.py:60
+#: ../src/common/config.py:61
 msgid "Away as a result of being idle"
 msgstr "发呆导致的离开"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "转换状态为“不可用”之前的时间(分钟)"
 
-#: ../src/common/config.py:63
+#: ../src/common/config.py:64
 msgid "Not available as a result of being idle"
 msgstr "发呆导致的不可用"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:91
 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:90
+#: ../src/common/config.py:92
 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 ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "如可能对 * / _ 格式化字串。"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果为真，不要移除 */_。所以 *abc* 将被加粗但 * * 不会被移除"
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 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
+#: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:109
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:140
+#: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "加入 * 和 [n] 在名单标题？"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:143
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr "聊天标签/窗口被重新打开时显示的历史谈话行数"
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "距上次谈话结束的分钟数"
 
-#: ../src/common/config.py:143
+#: ../src/common/config.py:145
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "用 Ctrl+回车 发行消息，回车开始新行(紫茉莉 ICQ 客户端默认操作)。"
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ctrl+上箭头 存储行数。"
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:150
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5143,62 +5346,87 @@ msgid ""
 msgstr ""
 "自定义地址 %s 在 %s 是单词/短语时，或 'WIKTIONARY' 意味着使用 wiktionary。"
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:153
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果选中，Gajim 可以接受 gajim-remote 远程控制。"
 
 #: ../src/common/config.py:154
 msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:155
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:156
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:158
+msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "关闭群聊标签/窗口前询问。"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr "关闭群聊标签/窗口前总是询问。"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:161
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of room jids."
+"of group chat jids."
 msgstr "关闭群聊标签/窗口前不再询问。"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:164
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 msgstr "为防止地址翻译转发，忽略用以发起文件传输的主机"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 标准规定 KiB = 1024 字节，KB = 1000 字节。"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:168
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "只有一个会话时显示标签？"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "一个会话时显示标签边框？"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "在标签上显示关闭键？"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in multi-user "
-"chat."
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "多用户聊天中，系统会高亮显示用分号隔开的发言列表"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5206,11 +5434,11 @@ msgstr ""
 "如选是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标"
 "时才会生效。"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "如选是， Gajim 会在每次启动时为 xmpp:// 注册。"
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:192
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5218,7 +5446,7 @@ msgstr ""
 "如选是， Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题，该图标可能"
 "是动态的。"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:193
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -5226,42 +5454,50 @@ msgid ""
 msgstr ""
 "如选是， Gajim 会在名单窗口中将每一个联系人的状态信息显示在它名字的下方"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 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:192
+#: ../src/common/config.py:196
 #, 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:193
+#: ../src/common/config.py:197
 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."
+"group chat."
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:199
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:202
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 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 "
@@ -5270,17 +5506,18 @@ msgstr ""
 "如选是并且 GTK+ 和 PyGTK 版本高于2.8，当有未决事件时窗口将会闪动(大部分窗口管"
 "理器的默认响应)"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:207
 #, 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."
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. 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:204
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5298,67 +5535,82 @@ msgstr ""
 "'每种类型' - 每种类型的消息 (例如, 单独聊天 及 群聊) 都发送到一个单独的窗口。"
 "注意，改变该选项后必须重启 Gajim 使设置生效"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:211
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "如选否，您将不会在窗口中看到明细"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:212
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "如选是，请按 escape 键关闭标签/窗口"
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:213
 #, fuzzy
 msgid "Hides the buttons in group chat window."
 msgstr "在群聊窗口中隐藏按钮"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Hides the buttons in two persons chat window."
 msgstr "在双人聊天窗口中隐藏按钮"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:215
 msgid "Hides the banner in a group chat window"
 msgstr "在群聊窗口中隐藏标语"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:216
 msgid "Hides the banner in two persons chat window"
 msgstr "在双人聊天窗口中隐藏标语"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the room occupants list in group chat window."
+msgid "Hides the group chat occupants list in group chat window."
 msgstr "在群聊窗口中隐藏房主列表"
 
-#: ../src/common/config.py:212
-msgid "Merge consecutive nickname in chat window."
+#: ../src/common/config.py:218
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:222
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:223
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFULL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:234
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:255
+#: ../src/common/config.py:263
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 工作区"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:267
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5366,150 +5618,147 @@ msgstr ""
 "如果选定， Gajim 将会使把您当前的 IP 和代理服务器设置用于文件传输代理服务器设"
 "置(_P)"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:326
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP 在本机不可用"
 
-#: ../src/common/config.py:318 ../src/common/config.py:321
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:336
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:337
 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
+#: ../src/common/config.py:338 ../src/common/config.py:340
+#: ../src/common/config.py:341 ../src/common/config.py:344
+#: ../src/common/config.py:345
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:351
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back soon"
 msgstr "马上回来"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:352
 msgid "Back in some minutes."
 msgstr "很快回来"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "Eating"
 msgstr "吃饭"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:353
 msgid "I'm eating, so leave me a message."
 msgstr "正在吃饭，请留言"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "Movie"
 msgstr "电影"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:354
 msgid "I'm watching a movie."
 msgstr "正在看电影"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:355
 msgid "I'm working."
 msgstr "工作中"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "Phone"
 msgstr "电话"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:356
 msgid "I'm on the phone."
 msgstr "我在打电话"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:357
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:361
 #, fuzzy
 msgid "I'm available."
 msgstr "在线"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:362
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "自由聊天"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 #, fuzzy
 msgid "I'm not available."
 msgstr "不可用"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:357 ../src/common/config.py:358
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
+#, fuzzy
 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."
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 "当收到的 MUC (多用户会议) 消息包含 “MUC 高亮单词”或您的昵称时播放的声音。"
 
-#: ../src/common/config.py:368
-msgid ""
-"Sound to play when any MUC message arrives. (This setting is taken into "
-"account only if notify_on_all_muc_messages is True)"
+#: ../src/common/config.py:377
+msgid "Sound to play when any MUC message arrives."
 msgstr ""
-"MUC （多用户会议）消息到达时播放的声音。(此设置只在“提示所有 MUC 消息”为真的"
-"时候对生效)"
 
-#: ../src/common/config.py:376 ../src/common/optparser.py:191
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:380 ../src/common/optparser.py:177
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "杂货店"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:394
 msgid "human"
 msgstr "人类"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:398
 msgid "marine"
 msgstr "海洋"
 
 #: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "无法加入房间"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
 msgid "Wrong host"
 msgstr "错误字段"
 
 #: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:150
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
@@ -5520,49 +5769,54 @@ msgstr ""
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "代理 %s 所需的注册信息未按时抵达"
 
-#: ../src/common/connection_handlers.py:1449
+#: ../src/common/connection_handlers.py:1519
 #, 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"
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1604
+#, fuzzy
+msgid "Unable to join group chat"
 msgstr "无法加入房间"
 
-#: ../src/common/connection_handlers.py:1512
-msgid "A password is required to join this room."
+#: ../src/common/connection_handlers.py:1582
+#, fuzzy
+msgid "A password is required to join this group chat."
 msgstr "该房间要求密码才能加入"
 
-#: ../src/common/connection_handlers.py:1515
-msgid "You are banned from this room."
+#: ../src/common/connection_handlers.py:1585
+#, fuzzy
+msgid "You are banned from this group chat."
 msgstr "您被该房间封禁。"
 
-#: ../src/common/connection_handlers.py:1518
-msgid "Such room does not exist."
+#: ../src/common/connection_handlers.py:1588
+#, fuzzy
+msgid "Such group chat does not exist."
 msgstr "不存在这样的房间"
 
-#: ../src/common/connection_handlers.py:1521
-msgid "Room creation is restricted."
+#: ../src/common/connection_handlers.py:1591
+#, fuzzy
+msgid "Group chat creation is restricted."
 msgstr "房间创建受限。"
 
-#: ../src/common/connection_handlers.py:1524
+#: ../src/common/connection_handlers.py:1594
 msgid "Your registered nickname must be used."
 msgstr "您注册的昵称已被使用"
 
-#: ../src/common/connection_handlers.py:1527
+#: ../src/common/connection_handlers.py:1597
 msgid "You are not in the members list."
 msgstr "您不在成员名单中。"
 
-#: ../src/common/connection_handlers.py:1535
+#: ../src/common/connection_handlers.py:1605
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5570,27 +5824,27 @@ msgstr ""
 "您申请的昵称正在使用或被其他人占有。\n"
 "从下列昵称中另外指定一个："
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1651
 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
+#: ../src/common/connection_handlers.py:1672
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr " %s 请求认证"
 
-#: ../src/common/connection_handlers.py:1604
+#: ../src/common/connection_handlers.py:1674
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr " %s 请求解除认证"
 
-#: ../src/common/connection_handlers.py:1606
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s 解除了认证"
 
-#: ../src/common/connection_handlers.py:1776
+#: ../src/common/connection_handlers.py:1846
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5599,88 +5853,87 @@ msgstr ""
 "JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ 的名"
 "单管理工具移除。"
 
-#: ../src/common/connection.py:162
-#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/connection.py:164
+#: ../src/common/zeroconf/connection_zeroconf.py:196
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户“%s”的连接丢失"
 
-#: ../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:165
+msgid "Reconnect manually."
+msgstr ""
 
-#: ../src/common/connection.py:175 ../src/common/connection.py:201
-#, python-format
-msgid "Transport %s answered wrongly to register request."
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, fuzzy, python-format
+msgid "Transport %s answered wrongly to register request: %s"
 msgstr "服务代理 %s 对注册请求的响应错误"
 
 #. wrong answer
-#: ../src/common/connection.py:200
+#: ../src/common/connection.py:202
 msgid "Invalid answer"
 msgstr "无效答案"
 
-#: ../src/common/connection.py:388 ../src/common/connection.py:423
-#: ../src/common/connection.py:861
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:871
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:402
+#: ../src/common/connection.py:408
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "连接到服务器 %s:%s 通过 %s"
 
-#: ../src/common/connection.py:424
+#: ../src/common/connection.py:430
 msgid "Check your connection or try again later"
 msgstr "检查连接并稍后重试"
 
-#: ../src/common/connection.py:449
+#: ../src/common/connection.py:455
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "“%s”登录验证失败"
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:456
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:564
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/common/connection.py:573
+#: ../src/common/zeroconf/connection_zeroconf.py:156
 msgid "OpenPGP passphrase was not given"
 msgstr "未获得 OpenPGP 密文"
 
 #. %s is the account name here
-#: ../src/common/connection.py:566
-#: ../src/common/zeroconf/connection_zeroconf.py:166
+#: ../src/common/connection.py:575
+#: ../src/common/zeroconf/connection_zeroconf.py:158
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "您将在无 OpenPGP 情况下连接到 %s。"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:606
+#: ../src/common/connection.py:615
 msgid "invisible"
 msgstr "隐身"
 
-#: ../src/common/connection.py:607
+#: ../src/common/connection.py:616
 msgid "offline"
 msgstr "离线"
 
-#: ../src/common/connection.py:608
+#: ../src/common/connection.py:617
 #, python-format
 msgid "I'm %s"
 msgstr "我是 %s"
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:708
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[本条消息已加密]"
 
-#: ../src/common/connection.py:748
-#: ../src/common/zeroconf/connection_zeroconf.py:385
+#: ../src/common/connection.py:758
+#: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5689,16 +5942,16 @@ msgstr ""
 "主题：%s\n"
 "%s"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:897
 msgid "Not fetched because of invisible status"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:33
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "本机缺少 D-Bus python 绑定"
 
-#: ../src/common/dbus_support.py:35
+#: ../src/common/dbus_support.py:34
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim 的 D-Bus 兼容性无法使用"
 
@@ -5885,238 +6138,238 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:103
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "无效的用户名特征。"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "此处需要服务器地址"
 
-#: ../src/common/helpers.py:113
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "无效的主机名特征。"
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "无效的资源特征。"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:179
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:210
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:212
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:215
 msgid "_Not Available"
 msgstr "不可用(_N)"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:220
 msgid "_Free for Chat"
 msgstr "自由聊天(_F)"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:222
 msgid "Free for Chat"
 msgstr "自由聊天"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:225
 msgid "_Available"
 msgstr "在线(_A)"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:227
 msgid "Available"
 msgstr "在线"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:229
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:232
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:237
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:239
 msgid "Offline"
 msgstr "离线"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:242
 msgid "_Invisible"
 msgstr "隐身(_I)"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Unknown"
 msgstr "?contact has status: 未知"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:250
 msgid "?contact has status:Has errors"
 msgstr "?contact has status: 有错误"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:255
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have: 无"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:257
 msgid "To"
 msgstr "到"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:259
 msgid "From"
 msgstr "来自"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "双方"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:269
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription): 无"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:271
 msgid "Subscribe"
 msgstr "认证"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:280
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role: 无"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:283
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:285
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:288
 msgid "Participants"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:290
 msgid "Participant"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:293
 msgid "Visitors"
 msgstr "访客"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:295
 msgid "Visitor"
 msgstr "访客"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:301
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Role: 无"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:303
 #, fuzzy
 msgid "Owner"
 msgstr "拥有人(_O)"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:305
 #, fuzzy
 msgid "Administrator"
 msgstr "管理员(_A)"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:307
 #, fuzzy
 msgid "Member"
 msgstr "成员(_M)"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:346
 msgid "is paying attention to the conversation"
 msgstr "正在专注于聊天"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:348
 msgid "is doing something else"
 msgstr "在做其他事"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:350
 msgid "is composing a message..."
 msgstr "正在输入消息..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:353
 msgid "paused composing a message"
 msgstr "中断输入消息"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:355
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
-#: ../src/common/helpers.py:871
+#: ../src/common/helpers.py:880
 #, fuzzy, python-format
 msgid " %d unread message"
 msgid_plural " %d unread messages"
 msgstr[0] "Gajim - %d 条未读消息 "
 
-#: ../src/common/helpers.py:877
+#: ../src/common/helpers.py:886
 #, fuzzy, python-format
 msgid " %d unread single message"
 msgid_plural " %d unread single messages"
 msgstr[0] "Gajim - %d 条未读消息"
 
-#: ../src/common/helpers.py:883
+#: ../src/common/helpers.py:892
 #, 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
+#: ../src/common/helpers.py:898
 #, 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
+#: ../src/common/helpers.py:908 ../src/common/helpers.py:910
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6127,50 +6380,115 @@ msgstr "Gajim - %s"
 msgid "error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/common/optparser.py:177
+#: ../src/common/optparser.py:183
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:186 ../src/common/optparser.py:187
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/common/optparser.py:316
+#: ../src/common/optparser.py:302
 #, fuzzy
 msgid "migrating logs database to indeces"
 msgstr "建立日志数据库"
 
-#: ../src/common/passwords.py:61
+#: ../src/common/passwords.py:86
 #, fuzzy, python-format
 msgid "Gajim account %s"
 msgstr "帐户 %s 的"
 
+#: ../src/common/zeroconf/client_zeroconf.py:189
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:205
+#, fuzzy
+msgid "Connection to host could not be established"
+msgstr "无法与对方建立连接。"
+
+#: ../src/common/zeroconf/client_zeroconf.py:334
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:629
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:197
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr "您需要重新连接才能继续收发消息。"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
 #: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, fuzzy
 msgid "Could not start local service"
 msgstr "无法读取图片"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:228
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "无法加入房间"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:232
+#: ../src/common/zeroconf/connection_zeroconf.py:325
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "尚未连接到“%s”"
 
+#: ../src/common/zeroconf/connection_zeroconf.py:341
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "[This message is encrypted]"
 msgstr "[本条消息已加密]"
 
-#~ msgid "_Subscribe"
-#~ msgstr "认证(_S)"
+#: ../src/common/zeroconf/zeroconf.py:180
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "发送 %s ( %s ) 时出现错误"
+
+#, fuzzy
+#~ msgid "_New room"
+#~ msgstr "新房间"
+
+#~ msgid "Role: "
+#~ msgstr "角色："
+
+#~ msgid "Affiliation: "
+#~ msgstr "会籍："
+
+#~ msgid ""
+#~ "Sound to play when any MUC message arrives. (This setting is taken into "
+#~ "account only if notify_on_all_muc_messages is True)"
+#~ msgstr ""
+#~ "MUC （多用户会议）消息到达时播放的声音。(此设置只在“提示所有 MUC 消息”为真"
+#~ "的时候对生效)"
 
 #, fuzzy
 #~ msgid "Add"
@@ -6192,10 +6510,6 @@ msgstr "[本条消息已加密]"
 #~ msgid "Not Available "
 #~ msgstr "不可用"
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "删除"
-
 #~ msgid "Contact _Info"
 #~ msgstr "联系人信息(_I)"
 
@@ -6226,9 +6540,6 @@ 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 条未读消息 "
@@ -6312,9 +6623,6 @@ msgstr "[本条消息已加密]"
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "如果选定，Gajim 同样可以显示系统托盘图标"
 
-#~ msgid "_Online Users"
-#~ msgstr "在线用户(_O)"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "使用账户 %s 加入群聊"